Bogdan Radulescu
4f19852587
Made some claridications in the AWS provider for salt-cloud
2015-05-08 17:50:24 +03:00
James Lamb
f18dc55ccb
Merge branch 'develop' of https://github.com/jimmystewpot/salt into develop
2015-03-06 15:12:55 +11:00
James Lamb
ae1728ec4f
Update documentation to include how to set a static IP within the VPC for aws/ec2
2015-03-06 15:10:02 +11:00
Seth House
1399949196
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-03-02 14:19:37 -07:00
C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
Fred Reimer
883e4d1d1a
Added win_deploy_auth_retries and win_deploy_auth_retry_delay for ec2 cloud
2015-02-28 17:08:44 -05:00
Fred Reimer
f94a3cbe2b
Fix quote
2015-02-25 22:57:05 -05:00
Fred Reimer
376e4a6e79
Added documentation information concerning the ability to use instance role credentials
2015-02-25 22:51:45 -05:00
Thomas Jackson
8b635fe07d
Comma Cleanup
2014-12-12 11:32:16 -08:00
Colton Myers
fcc2196a5f
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/cloud/__init__.py
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
salt/modules/file.py
salt/modules/zcbuildout.py
salt/runner.py
salt/runners/lxc.py
salt/runners/manage.py
salt/utils/schedule.py
tests/unit/modules/boto_vpc_test.py
tests/unit/modules/hashutil_test.py
tests/unit/templates/jinja_test.py
2014-12-01 15:04:03 -07:00
Tim O'Guin
39fb372898
fixed allocate_new_eip typo in AWS cloud docs
2014-12-01 14:46:32 -06:00
jmdcal
5e2bbe363a
fixed confusion
...
Here it says clearly : http://salt-cloud.readthedocs.org/en/latest/topics/aws.html
EC2 instances can have a public or private IP, or both. When an instance is deployed, Salt Cloud needs to log into it via SSH to run the deploy script. By default, the public IP will be used for this. If the salt-cloud command is run from another EC2 instance, the private IP should be used.
my-ec2-config:
# Specify whether to use public or private IP for deploy script
# private_ips or public_ips
ssh_interface: public_ips
2014-11-19 12:32:07 -06:00
Thomas S Hatch
1638e58245
Merge branch 'master' of https://github.com/jimmystewpot/salt into jimmystewpot-master
...
Conflicts:
doc/topics/cloud/aws.rst
2014-10-23 13:29:24 -06:00
jimmystewpot
271f6c4257
Update aws.rst
...
remove note it was a typo
2014-10-21 16:20:46 +11:00
jimmystewpot
8fd88cc0d3
Update aws.rst
...
Updated the document to reflect a storage type that would work. Currently only gp2 and standard function because there is no support for the provisioned iops
2014-10-21 16:18:31 +11:00
jimmystewpot
9edaf65bbe
Update aws.rst
...
added additional component for Ebs.
2014-10-21 15:59:02 +11:00
jimmystewpot
abd8437205
Update aws.rst
...
Added undocumented feature for Ebs.VolumeType to the example so people do not need to read the source to identify how to change the EBS volume Type:
2014-10-21 15:57:42 +11:00
Joseph Hall
9d6e4ff168
Get rid of Micro Instance examples
2014-09-27 11:09:08 -06:00
Colton Myers
99e97320e1
Merge branch '2014.7' into develop
...
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
2014-09-22 14:22:54 -06:00
rallytime
9a4f9e6fae
Clarify region settings in ec2 config docs
2014-09-17 16:16:35 -06:00
Robert Fairburn
235695ee19
Specify the version that interface properties were added in doc/topics/cloud/aws.rst
2014-08-27 14:02:01 -06:00
Dan Rowles
329351313a
Add support for adding secondary IP addresses to network interfaces
...
when provisioning EC2 instances with salt-cloud.
2014-06-26 20:29:15 +00:00
Joseph Hall
acc98cbe62
Update AWS docs for new tagging functionality
2014-04-16 08:49:19 -06:00
Joseph Hall
61f05b54dc
Update cloud docs to note new requests dependency
2014-04-01 12:23:50 -06:00
Joseph Hall
a76e202003
Merge pull request #11183 from allanparsons/develop
...
Update aws.rst
2014-03-12 14:47:34 -06:00
Allan Parsons
4ba6ec4c87
Update aws.rst
...
Added additional documentation for VPC, Auto Assign EIP, and tagging instances
2014-03-12 13:32:47 -07:00
Mike Place
a485eceac9
Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301.
...
Conflicts:
doc/topics/installation/index.rst
2014-02-20 16:16:59 -07:00
Erik Johnson
3ed0996a90
Miscellaneous docs fixes
...
Formatting, quieting build errors, etc.
2014-02-03 22:11:56 -06:00
Chris Rebert
bbdcb81e9b
copyedit doc/topics/cloud/aws.rst
2014-01-10 12:43:08 -08:00
Abe Music
0de31bdc50
Add example for wait_for_spot_interval_multiplier
2014-01-10 12:46:51 -06:00
Abe Music
104d94cf7d
Adding pool size doc; updating aws doc to include spot instance and EBS volume support
2014-01-10 12:16:51 -06:00
Benn Eichhorn
c0df125151
updated aws docs
2013-12-16 11:48:27 +11:00
Joseph Hall
e9f0f2c02e
Add one more warning about large amounts of data
2013-12-13 19:52:38 -07:00
Joseph Hall
ddfaffa090
Allow EC2 to list images based on owner
2013-12-13 19:46:38 -07:00
Joseph Hall
41afc62621
Fixing formatting errors in cloud docs
2013-11-22 20:25:33 -07:00
Seth House
a566e2829c
Revert inline links to anonymous link targets, but with valid rST
...
@s0undt3ch reports this syntax is better for translations.
2013-11-11 00:29:54 -07:00
Seth House
d379371aa7
Fixed misc rST syntax
2013-11-08 15:08:33 -07:00
Seth House
e4f638e6d7
Moved salt-cloud documentation into main docs dir
2013-11-08 14:08:36 -07:00
