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
76,677 Commits 24 Branches 182 Tags 341 MiB
73f4c43e2a
Commit Graph

82 Commits

Author SHA1 Message Date
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile 
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
 2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
rallytime
e10058c831 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-31 10:15:25 -06:00
rallytime
39459ed30b Document the existence of placementgroup option in ec2 driver 2016-10-28 12:51:46 -06:00
Nicole Thomas
95591c2fe6 Add documentation about salt_interface to EC2 docs (#36015) 
Fixes #35618
 2016-09-02 14:37:04 -06:00
Mike Place
f115e6fc8f Merge pull request #35919 from rallytime/fix-35618 
Add documentation about salt_interface to EC2 docs
 2016-09-02 00:20:27 +09:00
rallytime
ef2871c357 Add documentation about salt_interface to EC2 docs 
Fixes #35618
 2016-08-30 15:23:50 -06:00
Archie
f060ba903e Fix a typo (#33052) 2016-05-04 15:20:27 -06:00
rallytime
5952e3e300 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/mac_brew.py
  - salt/states/archive.py
 2016-04-28 15:35:34 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/archive.py
 2016-04-28 14:22:58 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 10:56:25 -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
Josh Fraser
718d6bde11 There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-20 21:55:29 -07:00
Amir Pakdel
131d3a1911 AWS securitygroupname and subnetname 
Added support for subnetname and securitygroupname for EC2
instances.
Since there can be one subnet assigned to an instance, subnetid
takes precedence over subnetname; but securitygroupid and
securitygroupname are merged together to create a songle
SecurityGroup list.
 2016-03-07 12:25:45 -05:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Colton Myers
967e862027 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/loader.py
    salt/modules/npm.py
    salt/pillar/__init__.py
 2016-01-29 15:51:52 -07:00
Clark Perkins
bfec052e7d Added some extra documentation 2016-01-27 11:45:22 -06:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
Aditya Kulkarni
61a9293af9 Add info about VolumeType 2015-12-21 11:26:53 -05:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07: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
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Bogdan Radulescu
c9e8228f3c Documented import_keypair for the ec2 driver 2015-10-20 12:41:28 +00: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
avinassh
e265ba8592 Fix a typo 2015-10-05 19:21:16 +05:30
Jonathan Ballet
fc8a1bc349 doc: remove duplicated Salt Cloud AWS section on Termination Protection 2015-09-25 10:20:53 +02: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
scottjpack
ee898d082a 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-17 21:31:14 -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