valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,649 Commits 24 Branches 182 Tags 341 MiB
1cd6a45b8f
Commit Graph

58 Commits

Author SHA1 Message Date
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
Josh Fraser
26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-21 09:08:21 -06:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Clark Perkins
bfec052e7d Added some extra documentation 2016-01-27 11:45:22 -06:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Mike Place
de7f3d5a59 Merge pull request #29504 from rallytime/fix-12072 
Document userdata_file option for EC2 driver
 2015-12-08 09:54:33 -07:00
rallytime
90b4823bc2 Switch volumes and del_*_on_destroy example ordering 
Refs #29101
 2015-12-07 19:30:23 -07:00
rallytime
8357c95dc2 Document userdata_file option for EC2 driver 
Fixes #12072
 2015-12-07 16:52:10 -07:00
Bogdan Radulescu
4a7eee08a8 Documented import_keypair for the ec2 driver 2015-11-23 09:00:51 -07:00
rallytime
13a9bc9053 Use eipalloc instead of eni in EC2 interface properties example 
Fixes #27815
 2015-10-13 14:46:01 -06:00
avinassh
bfa0acfbfe Fix a typo 2015-10-05 08:58:51 -06:00
Colton Myers
c08668ecf1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/fileserver/gitfs.py
    salt/master.py
    salt/pillar/s3.py
 2015-08-18 12:13:05 -06:00
scottjpack
0254a2e90e Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-18 09:22:57 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs. 
Refs #24797
 2015-08-10 09:20:26 -06:00
Peter Tripp
72323fcac9 Document SourceDestCheck added in #25242. 2015-07-08 12:31:36 -07:00
rallytime
0dba3feb63 Change provider config refernces to driver in docs 2015-06-17 16:41:03 -06:00
Colton Myers
baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
    salt/roster/clustershell.py
 2015-06-03 13:47:08 -06:00
rallytime
a235b114d7 Remove references to mount_points in ec2 docs 
Fixes #14021
 2015-06-02 16:32:26 -06:00
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