saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Get rid of Micro Instance examples

Browse source
This commit is contained in:
Joseph Hall 2014-09-27 11:09:08 -06:00
parent 52fa0a1612
commit 9d6e4ff168
13 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/cloud.profiles
View file

@ -1,7 +1,7 @@
base_ec2:
provider: my-ec2-config
image: ami-e565ba8c
size: Micro Instance
size: t1.micro
script: python-bootstrap
minion:
cheese: edam

20
conf/cloud.profiles.d/EC2-us-east-1.profiles
View file

@ -5,7 +5,7 @@
arch_ec2:
provider: my-ec2-config
image: ami-6ee95107
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-east-1
minion:
@ -15,7 +15,7 @@ arch_ec2:
arch_cloud-init_ec2:
provider: my-ec2-config
image: ami-596de730
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-east-1
minion:
@ -27,7 +27,7 @@ arch_cloud-init_ec2:
centos_6:
provider: my-ec2-config
image: ami-86e15bef
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-east-1
minion:
@ -39,7 +39,7 @@ centos_6:
debian_squeeze_ec2:
provider: my-ec2-config
image: ami-a121a6c8
size: Micro Instance
size: t1.micro
ssh_username: admin
location: us-east-1
minion:
@ -51,7 +51,7 @@ debian_squeeze_ec2:
fedora_17_ec2:
provider: my-ec2-config
image: ami-2ea50247
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-east-1
minion:
@ -61,7 +61,7 @@ fedora_17_ec2:
fedora_18_ec2:
provider: my-ec2-config
image: ami-6145cc08
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-east-1
minion:
@ -71,11 +71,11 @@ fedora_18_ec2:
# FreeBSD 9.1
# http://www.daemonology.net/freebsd-on-ec2/
# this micro instance does not auto-populate SSH keys see above link
# this t1.micro instance does not auto-populate SSH keys see above link
freebsd_91_ec2:
provider: my-ec2-config
image: ami-5339bb3a
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-east-1
minion:
@ -97,7 +97,7 @@ freebsd_91_4XL_ec2:
ubuntu_lucid_ec2:
provider: my-ec2-config
image: ami-21e47148
size: Micro Instance
size: t1.micro
ssh_username: ubuntu
location: us-east-1
minion:
@ -107,7 +107,7 @@ ubuntu_lucid_ec2:
ubuntu_precise_ec2:
provider: my-ec2-config
image: ami-0145d268
size: Micro Instance
size: t1.micro
ssh_username: ubuntu
location: us-east-1
minion:

20
conf/cloud.profiles.d/EC2-us-west-1.profiles
View file

@ -5,7 +5,7 @@
arch_ec2:
provider: my-ec2-config
image: ami-337d5b76
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-west-1
minion:
@ -15,7 +15,7 @@ arch_ec2:
arch_cloud-init_ec2:
provider: my-ec2-config
image: ami-6a5f7c2f
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-west-1
minion:
@ -27,7 +27,7 @@ arch_cloud-init_ec2:
centos_6:
provider: my-ec2-config
image: ami-f61630b3
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-west-1
minion:
@ -39,7 +39,7 @@ centos_6:
debian_squeeze_ec2:
provider: my-ec2-config
image: ami-2c735269
size: Micro Instance
size: t1.micro
ssh_username: admin
location: us-west-1
minion:
@ -51,7 +51,7 @@ debian_squeeze_ec2:
fedora_17_ec2:
provider: my-ec2-config
image: ami-877e24c2
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-west-1
minion:
@ -61,7 +61,7 @@ fedora_17_ec2:
fedora_18_ec2:
provider: my-ec2-config
image: ami-0899b94d
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-west-1
minion:
@ -71,11 +71,11 @@ fedora_18_ec2:
# FreeBSD 9.1
# http://www.daemonology.net/freebsd-on-ec2/
# this micro instance does not auto-populate SSH keys see above link
# this t1.micro instance does not auto-populate SSH keys see above link
freebsd_91_ec2:
provider: my-ec2-config
image: ami-4c8baa09
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-west-1
minion:
@ -87,7 +87,7 @@ freebsd_91_ec2:
ubuntu_lucid_ec2:
provider: my-ec2-config
image: ami-e63013a3
size: Micro Instance
size: t1.micro
ssh_username: ubuntu
location: us-west-1
minion:
@ -97,7 +97,7 @@ ubuntu_lucid_ec2:
ubuntu_precise_ec2:
provider: my-ec2-config
image: ami-3ed8fb7b
size: Micro Instance
size: t1.micro
ssh_username: ubuntu
location: us-west-1
minion:

20
conf/cloud.profiles.d/EC2-us-west-2.profiles
View file

@ -5,7 +5,7 @@
arch_ec2:
provider: my-ec2-config
image: ami-bcf77e8c
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-west-2
minion:
@ -15,7 +15,7 @@ arch_ec2:
arch_cloud-init_ec2:
provider: my-ec2-config
image: ami-6a5f7c2f
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-west-2
minion:
@ -27,7 +27,7 @@ arch_cloud-init_ec2:
centos_6:
provider: my-ec2-config
image: ami-de5bd2ee
size: Micro Instance
size: t1.micro
ssh_username: root
location: us-west-2
minion:
@ -39,7 +39,7 @@ centos_6:
debian_squeeze_ec2:
provider: my-ec2-config
image: ami-e4da52d4
size: Micro Instance
size: t1.micro
ssh_username: admin
location: us-west-2
minion:
@ -51,7 +51,7 @@ debian_squeeze_ec2:
fedora_17_ec2:
provider: my-ec2-config
image: ami-8e69e5be
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-west-2
minion:
@ -61,7 +61,7 @@ fedora_17_ec2:
fedora_18_ec2:
provider: my-ec2-config
image: ami-0266ed32
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-west-2
minion:
@ -71,11 +71,11 @@ fedora_18_ec2:
# FreeBSD 9.1
# http://www.daemonology.net/freebsd-on-ec2/
# this micro instance does not auto-populate SSH keys see above link
# this t1.micro instance does not auto-populate SSH keys see above link
freebsd_91_ec2:
provider: my-ec2-config
image: ami-aa09819a
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
location: us-west-2
minion:
@ -97,7 +97,7 @@ freebsd_91_4XL_ec2:
ubuntu_lucid_ec2:
provider: my-ec2-config
image: ami-6ec8425e
size: Micro Instance
size: t1.micro
ssh_username: ubuntu
location: us-west-2
minion:
@ -107,7 +107,7 @@ ubuntu_lucid_ec2:
ubuntu_precise_ec2:
provider: my-ec2-config
image: ami-e0941ed0
size: Micro Instance
size: t1.micro
ssh_username: ubuntu
location: us-west-2
minion:

4
doc/topics/cloud/aws.rst
View file

@ -210,13 +210,13 @@ Set up an initial profile at ``/etc/salt/cloud.profiles``:
base_ec2_private:
provider: my-ec2-southeast-private-ips
image: ami-e565ba8c
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
base_ec2_public:
provider: my-ec2-southeast-public-ips
image: ami-e565ba8c
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
base_ec2_db:

16
doc/topics/cloud/config.rst
View file

@ -130,7 +130,7 @@ configuration key in the defined profiles.
rhel_aws:
provider: aws
image: ami-e565ba8c
size: Micro Instance
size: t1.micro
* To:
@ -140,7 +140,7 @@ configuration key in the defined profiles.
rhel_aws:
provider: my-aws-migrated-config
image: ami-e565ba8c
size: Micro Instance
size: t1.micro
This new configuration syntax even allows you to have multiple cloud
@ -174,7 +174,7 @@ key on any defined profile to change, see the example:
rhel_aws_dev:
provider: production-config:aws
image: ami-e565ba8c
size: Micro Instance
size: t1.micro
rhel_aws_prod:
provider: production-config:aws
@ -725,7 +725,7 @@ Some example usage on how to use ``extends`` with profiles. Consider
development-instances:
provider: my-ec2-config
size: Micro Instance
size: t1.micro
ssh_username: ec2_user
securitygroup:
- default
@ -755,27 +755,27 @@ data:
'profile': 'Fedora-17',
'provider': 'my-ec2-config',
'securitygroup': ['default'],
'size': 'Micro Instance',
'size': 't1.micro',
'ssh_username': 'ec2_user'},
{'deploy': False,
'image': 'ami-09b61d60',
'profile': 'CentOS-5',
'provider': 'my-aws-config',
'securitygroup': ['default'],
'size': 'Micro Instance',
'size': 't1.micro',
'ssh_username': 'ec2_user'},
{'deploy': False,
'image': 'ami-54cf5c3d',
'profile': 'Amazon-Linux-AMI-2012.09-64bit',
'provider': 'my-ec2-config',
'securitygroup': ['default'],
'size': 'Micro Instance',
'size': 't1.micro',
'ssh_username': 'ec2_user'},
{'deploy': False,
'profile': 'development-instances',
'provider': 'my-ec2-config',
'securitygroup': ['default'],
'size': 'Micro Instance',
'size': 't1.micro',
'ssh_username': 'ec2_user'}]
Pretty cool right?

4
doc/topics/cloud/deploy.rst
View file

@ -116,7 +116,7 @@ Or even on the VM's profile settings:
ubuntu_aws:
provider: aws
image: ami-7e2da54e
size: Micro Instance
size: t1.micro
deploy: False
@ -176,7 +176,7 @@ to pass arguments to the deploy script:
aws-amazon:
provider: aws
image: ami-1624987f
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
script: bootstrap-salt
script_args: -c /tmp/

2
doc/topics/cloud/misc.rst
View file

@ -16,7 +16,7 @@ to pass arguments to the deploy script:
ec2-amazon:
provider: ec2
image: ami-1624987f
size: Micro Instance
size: t1.micro
ssh_username: ec2-user
script: bootstrap-salt
script_args: -c /tmp/

4
doc/topics/cloud/profiles.rst
View file

@ -68,14 +68,14 @@ Larger Example
rhel_ec2:
provider: ec2
image: ami-e565ba8c
size: Micro Instance
size: t1.micro
minion:
cheese: edam
ubuntu_ec2:
provider: ec2
image: ami-7e2da54e
size: Micro Instance
size: t1.micro
minion:
cheese: edam

4
doc/topics/cloud/salt.rst
View file

@ -163,7 +163,7 @@ directly to Salt Cloud to create the instance:
.. code-block:: bash
salt myminion cloud.create my-ec2-config my-new-instance \
image=ami-1624987f size='Micro Instance' ssh_username=ec2-user \
image=ami-1624987f size='t1.micro' ssh_username=ec2-user \
securitygroup=default delvol_on_destroy=True
Please note that the execution module does *not* run in parallel mode. Using
@ -240,7 +240,7 @@ presence of the instance will be managed statefully.
cloud.present:
- provider: my-ec2-config
- image: ami-1624987f
- size: 'Micro Instance'
- size: 't1.micro'
- ssh_username: ec2-user
- securitygroup: default
- delvol_on_destroy: True

2
salt/cloud/__init__.py
View file

@ -360,7 +360,7 @@ class CloudClient(object):
.. code-block:: python
client.create(names=['myinstance'], provider='my-ec2-config',
kwargs={'image': 'ami-1624987f', 'size': 'Micro Instance',
kwargs={'image': 'ami-1624987f', 'size': 't1.micro',
'ssh_username': 'ec2-user', 'securitygroup': 'default',
'delvol_on_destroy': True})
'''

2
salt/modules/cloud.py
View file

@ -195,7 +195,7 @@ def create(provider, names, **kwargs):
.. code-block:: bash
salt minionname cloud.create my-ec2-config myinstance \
image=ami-1624987f size='Micro Instance' ssh_username=ec2-user \
image=ami-1624987f size='t1.micro' ssh_username=ec2-user \
securitygroup=default delvol_on_destroy=True
'''
client = _get_client()

2
salt/runners/cloud.py
View file

@ -148,7 +148,7 @@ def create(provider, instances, **kwargs):
.. code-block:: bash
salt-run cloud.create my-ec2-config myinstance \
image=ami-1624987f size='Micro Instance' ssh_username=ec2-user \
image=ami-1624987f size='t1.micro' ssh_username=ec2-user \
securitygroup=default delvol_on_destroy=True
'''
create_kwargs = {}