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

Commit f650e28

Browse files
techhattechhat
committed
Merge pull request saltstack#8765 from techhat/awsfix
Salt Cloud doc update.
2 parents 514934f + 401f9c7 commit f650e28

File tree

7 files changed

+114
-11
lines changed

7 files changed

+114
-11
lines changed

‎doc/topics/cloud/action.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The following is a list of actions currently supported by salt-cloud:
2525
2626
all providers:
2727
- reboot
28-
aws:
28+
ec2:
2929
- start
3030
- stop
3131
joyent:

‎doc/topics/cloud/gce.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Getting Started With Google Compute Engine
33
==========================================
44

5-
Google Compute Engine (GCE) is Goolge-infrastructure as a service that lets you
5+
Google Compute Engine (GCE) is Google-infrastructure as a service that lets you
66
run your large-scale computing workloads on virtual machines. This document
77
covers how to use Salt Cloud to provision and manage your virtual machines
88
hosted within Google's infrastructure.
@@ -14,7 +14,7 @@ at https://cloud.google.com.
1414
Dependencies
1515
============
1616
* `Libcloud <http://libcloud.apache.org>`_ version 0.14.0-beta3 or greater
17-
* A Google Cloud Platform account with Copmute Engine enabled
17+
* A Google Cloud Platform account with Compute Engine enabled
1818
* A registered Service Account for authorization
1919
* Oh, and obviously you'll need `salt <https://github.com/saltstack/salt>`_
2020

‎doc/topics/cloud/index.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ Getting Started
3232
Some quick guides covering getting started with Amazon AWS, Google Compute
3333
Engine, Parallels, Rackspace, and Softlayer.
3434

35-
* :doc:`Getting Started With AWS <aws>`
35+
* :doc:`Getting Started With AWS/EC2 <aws>`
3636
* :doc:`Getting Started With Google Compute Engine <gce>`
37+
* :doc:`Getting Started With Linode <linode>`
3738
* :doc:`Getting Started With Parallels <parallels>`
3839
* :doc:`Getting Started With Rackspace <rackspace>`
3940
* :doc:`Getting Started With SoftLayer <softlayer>`

‎doc/topics/cloud/linode.rst

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
===========================
2+
Getting Started With Linode
3+
===========================
4+
5+
Linode is a public cloud provider with a focus on Linux instances.
6+
7+
Dependencies
8+
============
9+
The Linode driver for Salt Cloud requires Libcloud 0.13.2 or higher to be
10+
installed.
11+
12+
13+
Configuration
14+
=============
15+
Linode requires a single API key, but the default root password for new
16+
instances also needs to be set:
17+
18+
.. code-block:: yaml
19+
20+
# Note: This example is for /etc/salt/cloud.providers or any file in the
21+
# /etc/salt/cloud.providers.d/ directory.
22+
23+
my-linode-config:
24+
apikey: asldkgfakl;sdfjsjaslfjaklsdjf;askldjfaaklsjdfhasldsadfghdkf
25+
password: F00barbaz
26+
provider: linode
27+
28+
The password needs to be 8 characters and contain lowercase, uppercase and
29+
numbers.
30+
31+
Profiles
32+
========
33+
34+
Cloud Profiles
35+
~~~~~~~~~~~~~~
36+
Set up an initial profile at ``/etc/salt/cloud.profiles`` or in the
37+
``/etc/salt/cloud.profiles.d/`` directory:
38+
39+
.. code-block:: yaml
40+
41+
linode_1024:
42+
provider: my-linode-config
43+
size: Linode 1024
44+
image: Arch Linux 2013.06
45+
46+
Sizes can be obtained using the ``--list-sizes`` option for the ``salt-cloud``
47+
command:
48+
49+
.. code-block:: bash
50+
51+
# salt-cloud --list-sizes my-linode-config
52+
my-linode-config:
53+
----------
54+
linode:
55+
----------
56+
Linode 1024:
57+
----------
58+
bandwidth:
59+
2000
60+
disk:
61+
49152
62+
driver:
63+
get_uuid:
64+
id:
65+
1
66+
name:
67+
Linode 1024
68+
price:
69+
20.0
70+
ram:
71+
1024
72+
uuid:
73+
03e18728ce4629e2ac07c9cbb48afffb8cb499c4
74+
...SNIP...
75+
76+
Images can be obtained using the ``--list-images`` option for the ``salt-cloud``
77+
command:
78+
79+
.. code-block:: bash
80+
81+
# salt-cloud --list-images my-linode-config
82+
my-linode-config:
83+
----------
84+
linode:
85+
----------
86+
Arch Linux 2013.06:
87+
----------
88+
driver:
89+
extra:
90+
----------
91+
64bit:
92+
1
93+
pvops:
94+
1
95+
get_uuid:
96+
id:
97+
112
98+
name:
99+
Arch Linux 2013.06
100+
uuid:
101+
8457f92eaffc92b7666b6734a96ad7abe1a8a6dd
102+
...SNIP...

‎doc/topics/cloud/map.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ A map file may also be used with the various query options:
7878
.. code-block:: bash
7979
8080
$ salt-cloud -m /path/to/mapfile -Q
81-
{'aws': {'web1': {'id': 'i-e6aqfegb',
81+
{'ec2': {'web1': {'id': 'i-e6aqfegb',
8282
'image': None,
8383
'private_ips': [],
8484
'public_ips': [],

‎doc/topics/cloud/misc.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ to pass arguments to the deploy script:
1313

1414
.. code-block:: yaml
1515
16-
aws-amazon:
17-
provider: aws
16+
ec2-amazon:
17+
provider: ec2
1818
image: ami-1624987f
1919
size: Micro Instance
2020
ssh_username: ec2-user

‎doc/topics/cloud/profiles.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ Larger Example
6363

6464
.. code-block:: yaml
6565
66-
rhel_aws:
67-
provider: aws
66+
rhel_ec2:
67+
provider: ec2
6868
image: ami-e565ba8c
6969
size: Micro Instance
7070
script: RHEL6
7171
minion:
7272
cheese: edam
7373
74-
ubuntu_aws:
75-
provider: aws
74+
ubuntu_ec2:
75+
provider: ec2
7676
image: ami-7e2da54e
7777
size: Micro Instance
7878
script: Ubuntu

0 commit comments

Comments
 (0)
0