8000 Merge pull request #8767 from techhat/clouddocs · linuxme/salt@dbe3a2c · GitHub
[go: up one dir, main page]
8000
Skip to content

Commit dbe3a2c

Browse files
techhattechhat
committed
Merge pull request saltstack#8767 from techhat/clouddocs
Fixing formatting errors in cloud docs
2 parents 30597f1 + 41afc62 commit dbe3a2c

File tree

3 files changed

+103
-109
lines changed

3 files changed

+103
-109
lines changed

‎doc/topics/cloud/aws.rst

Lines changed: 103 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -10,113 +10,111 @@ been deprecated in favor of the `ec2` provider. Configuration using the old
1010
`aws` provider will still function, but that driver is no longer in active
1111
development.
1212

13-
Set up the cloud config at ``/etc/salt/cloud``:
14-
1513
.. code-block:: yaml
1614
17-
# Note: This example is for /etc/salt/cloud
18-
19-
providers:
20-
my-ec2-southeast-public-ips:
21-
# Set up the location of the salt master
22-
#
23-
minion:
24-
master: saltmaster.example.com
25-
26-
# Set up grains information, which will be common for all nodes
27-
# using this provider
28-
grains:
29-
node_type: broker
30-
release: 1.0.1
31-
32-
# Specify whether to use public or private IP for deploy script.
33-
#
34-
# Valid options are:
35-
# private_ips - The salt-master is also hosted with EC2
36-
# public_ips - The salt-master is hosted outside of EC2
37-
#
38-
ssh_interface: public_ips
39-
40-
# Set the EC2 access credentials (see below)
41-
#
42-
id: HJGRYCILJLKJYG
43-
key: 'kdjgfsgm;woormgl/aserigjksjdhasdfgn'
44-
45-
# Make sure this key is owned by root with permissions 0400.
46-
#
47-
private_key: /etc/salt/my_test_key.pem
48-
keyname: my_test_key
49-
securitygroup: default
50-
51-
# Optionally configure default region
52-
#
53-
location: ap-southeast-1
54-
availability_zone: ap-southeast-1b
55-
56-
# Configure which user to use to run the deploy script. This setting is
57-
# dependent upon the AMI that is used to deploy. It is usually safer to
58-
# configure this individually in a profile, than globally. Typical users
59-
# are:
60-
#
61-
# Amazon Linux -> ec2-user
62-
# RHEL -> ec2-user
63-
# CentOS -> ec2-user
64-
# Ubuntu -> ubuntu
65-
#
66-
ssh_username: ec2-user
67-
68-
# Optionally add an IAM profile
69-
iam_profile: 'arn:aws:iam::123456789012:instance-profile/ExampleInstanceProfile'
70-
71-
provider: ec2
72-
73-
74-
my-ec2-southeast-private-ips:
75-
# Set up the location of the salt master
76-
#
77-
minion:
78-
master: saltmaster.example.com
79-
80-
# Specify whether to use public or private IP for deploy script.
81-
#
82-
# Valid options are:
83-
# private_ips - The salt-master is also hosted with EC2
84-
# public_ips - The salt-master is hosted outside of EC2
85-
#
86-
ssh_interface: private_ips
87-
88-
# Set the EC2 access credentials (see below)
89-
#
90-
id: HJGRYCILJLKJYG
91-
key: 'kdjgfsgm;woormgl/aserigjksjdhasdfgn'
92-
93-
# Make sure this key is owned by root with permissions 0400.
94-
#
95-
private_key: /etc/salt/my_test_key.pem
96-
keyname: my_test_key
97-
securitygroup: default
98-
99-
# Optionally configure default region
100-
#
101-
location: ap-southeast-1
102-
availability_zone: ap-southeast-1b
103-
104-
# Configure which user to use to run the deploy script. This setting is
105-
# dependent upon the AMI that is used to deploy. It is usually safer to
106-
# configure this individually in a profile, than globally. Typical users
107-
# are:
108-
#
109-
# Amazon Linux -> ec2-user
110-
# RHEL -> ec2-user
111-
# CentOS -> ec2-user
112-
# Ubuntu -> ubuntu
113-
#
114-
ssh_username: ec2-user
115-
116-
# Optionally add an IAM profile
117-
iam_profile: 'my other profile name'
118-
119-
provider: ec2
15+
# Note: This example is for /etc/salt/cloud.providers or any file in the
16+
# /etc/salt/cloud.providers.d/ directory.
17+
18+
my-ec2-southeast-public-ips:
19+
# Set up the location of the salt master
20+
#
21+
minion:
22+
master: saltmaster.example.com
23+
24+
# Set up grains information, which will be common for all nodes
25+
# using this provider
26+
grains:
27+
node_type: broker
28+
release: 1.0.1
29+
30+
# Specify whether to use public or private IP for deploy script.
31+
#
32+
# Valid options are:
33+
# private_ips - The salt-master is also hosted with EC2
34+
# public_ips - The salt-master is hosted outside of EC2
35+
#
36+
ssh_interface: public_ips
37+
38+
# Set the EC2 access credentials (see below)
39+
#
40+
id: HJGRYCILJLKJYG
41+
key: 'kdjgfsgm;woormgl/aserigjksjdhasdfgn'
42+
43+
# Make sure this key is owned by root with permissions 0400.
44+
#
45+
private_key: /etc/salt/my_test_key.pem
46+
keyname: my_test_key
47+
securitygroup: default
48+
49+
# Optionally configure default region
50+
#
51+
location: ap-southeast-1
52+
availability_zone: ap-southeast-1b
53+
54+
# Configure which user to use to run the deploy script. This setting is
55+
# dependent upon the AMI that is used to deploy. It is usually safer to
56+
# configure this individually in a profile, than globally. Typical users
57+
# are:
58+
#
59+
# Amazon Linux -> ec2-user
60+
# RHEL -> ec2-user
61+
# CentOS -> ec2-user
62+
# Ubuntu -> ubuntu
63+
#
64+
ssh_username: ec2-user
65+
66+
# Optionally add an IAM profile
67+
iam_profile: 'arn:aws:iam::123456789012:instance-profile/ExampleInstanceProfile'
68+
69+
provider: ec2
70+
71+
72+
my-ec2-southeast-private-ips:
73+
# Set up the location of the salt master
74+
#
75+
minion:
76+
master: saltmaster.example.com
77+
78+
# Specify whether to use public or private IP for deploy script.
79+
#
80+
# Valid options are:
81+
# private_ips - The salt-master is also hosted with EC2
82+
# public_ips - The salt-master is hosted outside of EC2
83+
#
84+
ssh_interface: private_ips
85+
86+
# Set the EC2 access credentials (see below)
87+
#
88+
id: HJGRYCILJLKJYG
89+
key: 'kdjgfsgm;woormgl/aserigjksjdhasdfgn'
90+
91+
# Make sure this key is owned by root with permissions 0400.
92+
#
93+
private_key: /etc/salt/my_test_key.pem
94+
keyname: my_test_key
95+
securitygroup: default
96+
97+
# Optionally configure default region
98+
#
99+
location: ap-southeast-1
100+
availability_zone: ap-southeast-1b
101+
102+
# Configure which user to use to run the deploy script. This setting is
103+
# dependent upon the AMI that is used to deploy. It is usually safer to
104+
# configure this individually in a profile, than globally. Typical users
105+
# are:
106+
#
107+
# Amazon Linux -> ec2-user
108+
# RHEL -> ec2-user
109+
# CentOS -> ec2-user
110+
# Ubuntu -> ubuntu
111+
#
112+
ssh_username: ec2-user
113+
114+
# Optionally add an IAM profile
115+
iam_profile: 'my other profile name'
116+
117+
provider: ec2
120118
121119
122120
Access Credentials

‎doc/topics/cloud/gogrid.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ in the configuration file to enable interfacing with GoGrid:
2525
# Note: This example is for /etc/salt/cloud.providers or any file in the
2626
# /etc/salt/cloud.providers.d/ directory.
2727
28-
.. code-block:: yaml
29-
3028
my-gogrid-config:
3129
provider: gogrid
3230
apikey: asdff7896asdh789

‎doc/topics/cloud/joyent.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ send the provisioning commands up to the freshly created virtual machine.
2424
# Note: This example is for /etc/salt/cloud.providers or any file in the
2525
# /etc/salt/cloud.providers.d/ directory.
2626
27-
.. code-block:: yaml
28-
2927
my-joyent-config:
3028
provider: joyent
3129
user: fred

0 commit comments

Comments
 (0)
0