Commit Graph

59739 Commits

Author SHA1 Message Date
Tom Williams
a9fa06c171 - Add test=True cases for new functions
- Add pass-through args for modified functions
- Describe limitations of current dhcp_options code
- versionadded:: Boron tags for new funcs
- Some formatting cleanup
2015-10-07 00:45:57 -04:00
Tom Williams
da0b2f8737 Resolve pylint whinging :) I strongly disagree with several PEP "standards" but... what can you do? 2015-10-06 18:30:22 -04:00
Tom Williams
5650006ae6 Enablement for using states to manage AWS EC2 instances
- ability to detect instance_names which are in 'terminated'-type states and thus safe to re-use
- fix some stacktraces from un-checked get_id calls
- add vpc_id/vpc_name options to various things that need them
- add availability_zone param to subnets so they can be attached to VPCs
- boto_ec2.instance_present()
- boto_ec2.instance_absent()
- various security_group fixes
- and WTH, some spelling and capitalization fixes...
2015-10-06 17:47:53 -04:00
Tom Williams
013e230545 Merge remote-tracking branch 'upstream/develop' into d.boto_vpc.dhcp_options_stuff 2015-10-06 17:40:57 -04:00
Nicole Thomas
ad8fd0a5c7 Merge pull request #27722 from Aoreias/develop
Sorted compare for alarm actions
2015-10-06 15:08:24 -06:00
Aoreias
09f5a56bb7 Sorted compare for alarm actions
Fix for boto_cloudwatch sometimes incorrectly returning a state change when a state is set with multiple alarm actions.
2015-10-06 14:59:36 -04:00
Nicole Thomas
1b9e814c13 Merge pull request #27718 from rallytime/merge-27635-and-27552
Merge #27635 and #27552
2015-10-06 12:40:24 -06:00
rallytime
b3201bce19 Change listeners to arg instead of kwarg 2015-10-06 11:56:51 -06:00
rallytime
249f02c2bb Protect against TypeError is listeners is None 2015-10-06 11:54:16 -06:00
rallytime
8ab7230535 Example formatting and versionadded directives 2015-10-06 11:54:03 -06:00
Ethan Moore
ba6d6c8911 Merge branch 'elb-listener-policy-mangement' of https://github.com/woodrow/salt into boto_elb_updates2
Conflicts:
	salt/states/boto_elb.py
2015-10-06 17:11:33 +00:00
Ethan Moore
3316959866 Merging tag and cname modifications 2015-10-06 17:01:33 +00:00
Stephen Woodrow
3f7e38951a Add one last docstring. 2015-10-06 01:24:38 -07:00
Stephen Woodrow
a223f348e9 Style fixes. 2015-10-06 01:12:14 -07:00
Stephen Woodrow
f50991c417 Add docstrings. 2015-10-05 23:41:16 -07:00
Stephen Woodrow
87584d1f1a Rename helper function. 2015-10-05 23:41:08 -07:00
Stephen Woodrow
509ded1bd0 Fix some tests. 2015-10-05 20:57:17 -07:00
Colton Myers
c27c5fb956 Merge pull request #27699 from terminalmage/tweak-logging
Tweak logging when git.latest state fails to cache identity file
2015-10-05 16:12:04 -06:00
Colton Myers
1c4002216d Merge pull request #27668 from garethgreenaway/27664_inotify_exclude
excludes for inotify beacon
2015-10-05 16:05:26 -06:00
Colton Myers
89da70664d Merge pull request #27700 from rallytime/lomeroe-boto_secgroup_tags
Fix code block example formatting
2015-10-05 16:03:31 -06:00
Colton Myers
189ae407d7 Merge pull request #27623 from lomeroe/boto_secgroup_tags
Boto secgroup tags
2015-10-05 16:01:28 -06:00
Erik Johnson
6e24063eb8 Tweak logging when git.latest state fails to cache identity file
See https://github.com/saltstack/salt/pull/27264#issuecomment-145677563
2015-10-05 16:49:51 -05:00
Erik Johnson
41c6d65f91 Merge pull request #27264 from garethgreenaway/allow_git_identity_pillar
Additions to the git module and git state module
2015-10-05 16:46:41 -05:00
rallytime
596a2438c0 Fix code block example formatting 2015-10-05 15:25:58 -06:00
Colton Myers
d6c48555bc Merge pull request #27558 from DSRCompany/issues/25785_fix_set_option_class
Fix set custom option class
2015-10-05 15:25:46 -06:00
Shane Lee
b957fde9d3 Merge pull request #27694 from rallytime/clean-27504
Merge Relevant commits from #27504
2015-10-05 15:18:08 -06:00
Tom Williams
d919c9a7e8 Update boto_ec2.run() to return the new instance_id rather than just True 2015-10-05 16:51:17 -04:00
Nicole Thomas
b170aa8e19 Merge pull request #27671 from gashev/import_error_no_module_named_git
Added skip test_ext_pillar_env_mapping if git module does not exist.
2015-10-05 14:44:38 -06:00
Dennis Harper
bead01a19b Refactored win_pkg to get all installed software as well as remove the win32* 3rd party module dependencies
Motivation:
I was not be able to get all installed software on both the 32bit and Wow64 registries. The problem is that the win32api module automatically redirects to the registry hive of the platform being run (Wow64 or 32 bit).
There was no way that I was able to find a way to prevent this from happening.

More information can be found here:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384232(v=vs.85).aspx

Furthermore, depending on if a program is 64 bit or 32 bit, when it is installed the program will be entered
in the appropriate registry hive. Thus, the win32api module will not get all installed software.

Implemantation/Fix:
The built in _winreg module allows for opening either the 64 or 32 bit hive, thus allowing for all installed software to be reported.
Furtheremore, using _winreg allows for the removal of third party dependencies as it is a built-in module for python.

Change-Id: I8ceacf297b4cdc60f9da53d223fb1a7e5e795db6
2015-10-05 14:18:22 -06:00
Dennis Harper
cf37ee858d Refactored win_pkg to get all installed software as well as remove the win32* 3rd party module dependencies
Motivation:
I was not be able to get all installed software on both the 32bit and Wow64 registries. The problem is that the win32api module automatically redirects to the registry hive of the platform being run (Wow64 or 32 bit).
There was no way that I was able to find a way to prevent this from happening.

More information can be found here:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384232(v=vs.85).aspx

Furthermore, depending on if a program is 64 bit or 32 bit, when it is installed the program will be entered
in the appropriate registry hive. Thus, the win32api module will not get all installed software.

Implemantation/Fix:
The built in _winreg module allows for opening either the 64 or 32 bit hive, thus allowing for all installed software to be reported.
Furtheremore, using _winreg allows for the removal of third party dependencies as it is a built-in module for python.

Change-Id: I1b642fc752cbb38b7192923bef0fb1f2b85913d2
2015-10-05 14:18:14 -06:00
Dennis Harper
b603e35754 Refactored win_pkg to get all installed software as well as remove the win32* 3rd party module dependencies
Motivation:
I was not be able to get all installed software on both the 32bit and Wow64 registries. The problem is that the win32api module automatically redirects to the registry hive of the platform being run (Wow64 or 32 bit).
There was no way that I was able to find a way to prevent this from happening.

More information can be found here:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384232(v=vs.85).aspx

Furthermore, depending on if a program is 64 bit or 32 bit, when it is installed the program will be entered
in the appropriate registry hive. Thus, the win32api module will not get all installed software.

Implemantation/Fix:
The built in _winreg module allows for opening either the 64 or 32 bit hive, thus allowing for all installed software to be reported.
Furtheremore, using _winreg allows for the removal of third party dependencies as it is a built-in module for python.

Change-Id: I89cd2ba20d2539ce44fcc51e192b38c07ad6a961
2015-10-05 14:18:06 -06:00
Dennis Harper
ae4d30b90a Refactored win_pkg to get all installed software as well as remove the win32* 3rd party module dependencies
Motivation:
I was not be able to get all installed software on both the 32bit and Wow64 registries. The problem is that the win32api module automatically redirects to the registry hive of the platform being run (Wow64 or 32 bit).
There was no way that I was able to find a way to prevent this from happening.

More information can be found here:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384232(v=vs.85).aspx

Furthermore, depending on if a program is 64 bit or 32 bit, when it is installed the program will be entered
in the appropriate registry hive. Thus, the win32api module will not get all installed software.

Implemantation/Fix:
The built in _winreg module allows for opening either the 64 or 32 bit hive, thus allowing for all installed software to be reported.
Furtheremore, using _winreg allows for the removal of third party dependencies as it is a built-in module for python.

Change-Id: I6b5788db819cf3b77cfafdebc6df74c8dccead1e
2015-10-05 14:18:01 -06:00
Dennis Harper
1d30271f57 Refactored win_pkg to get all installed software as well as remove the win32* 3rd party module dependencies
Motivation:
I was not be able to get all installed software on both the 32bit and Wow64 registries. The problem is that the win32api module automatically redirects to the registry hive of the platform being run (Wow64 or 32 bit).
There was no way that I was able to find a way to prevent this from happening.

More information can be found here:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384232(v=vs.85).aspx

Furthermore, depending on if a program is 64 bit or 32 bit, when it is installed the program will be entered
in the appropriate registry hive. Thus, the win32api module will not get all installed software.

Implemantation/Fix:
The built in _winreg module allows for opening either the 64 or 32 bit hive, thus allowing for all installed software to be reported.
Furtheremore, using _winreg allows for the removal of third party dependencies as it is a built-in module for python.

Change-Id: I6b5788db819cf3b77cfafdebc6df74c8dccead1e
2015-10-05 14:17:50 -06:00
Dennis Harper
d5f438aba9 Refactored win_pkg to get all installed software as well as remove the win32* 3rd party module dependencies
Motivation:
I was not be able to get all installed software on both the 32bit and Wow64 registries. The problem is that the win32api module automatically redirects to the registry hive of the platform being run (Wow64 or 32 bit).
There was no way that I was able to find a way to prevent this from happening.

More information can be found here:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384232(v=vs.85).aspx

Furthermore, depending on if a program is 64 bit or 32 bit, when it is installed the program will be entered
in the appropriate registry hive. Thus, the win32api module will not get all installed software.

Implemantation/Fix:
The built in _winreg module allows for opening either the 64 or 32 bit hive, thus allowing for all installed software to be reported.
Furtheremore, using _winreg allows for the removal of third party dependencies as it is a built-in module for python.

Change-Id: I5bf6de58d48b8e7e566b1fc18e35565ab92a5783
2015-10-05 14:17:41 -06:00
Tom Williams
ca1b11c7b7 Add almost all available boto.ec2.run_instances() params to boto_ec2.run() 2015-10-05 15:52:43 -04:00
Tom Williams
bd1e2c236b Add support for passing 'subnet_name' as an alternative to 'subnet_id' for boto_ec2.run() 2015-10-05 15:52:42 -04:00
Tom Williams
d24753b7bd Fix stacktrace when calling boto_ec2.run() 2015-10-05 15:52:42 -04:00
Tom Williams
cd4225b564 Allow 'instance_name' (vs. 'instance_id') in route option to boto_vpc.route_table_present() 2015-10-05 15:52:42 -04:00
Tom Williams
fe925920cf Add dhcp_options manipulation functions to the module, so that we can then do dhcp_options_present() in the boto_vpc state 2015-10-05 15:52:42 -04:00
Nicole Thomas
168281d85f Merge pull request #27649 from tkwilliams/d.boto_ec2_allocate_address
Add some missing functionality to the boto_ec2 module:
2015-10-05 12:57:49 -06:00
Nicole Thomas
58cd9325ce Merge pull request #27476 from belvedere-trading/27373
fix for: https://github.com/saltstack/salt/issues/27373
2015-10-05 11:51:06 -06:00
Nicole Thomas
f42482e2b8 Merge pull request #27656 from gracinet/27655-pg-local-cache-success
Fix #27655: handling of success in postgres_local_cache
2015-10-05 11:43:35 -06:00
Nicole Thomas
31b3fd74c8 Merge pull request #27566 from blueyed/fix-local-returners-recurse_count
returners.local_cache: fix endless loop on OSError
2015-10-05 11:38:33 -06:00
Tom Williams
801d796185 Add ".. versionadded:: Boron" to new functions, general doc string cleanup. 2015-10-05 13:13:31 -04:00
Nicole Thomas
41e8694288 Merge pull request #27535 from silenius/issue_27505
Issue 27505
2015-10-05 11:13:26 -06:00
Nicole Thomas
c70a576fe8 Merge pull request #27659 from gnubyexample/develop
.pub as public key is what we should send to remote
2015-10-05 11:08:20 -06:00
C. R. Oldham
737757f2db Merge pull request #27642 from rallytime/pkg-beacon-version
Add versionadded to pkg beacon
2015-10-05 11:00:29 -06:00
Nicole Thomas
6aa7637cd1 Merge pull request #27650 from tkwilliams/d.boto_secgroup.absent.return.status
Fixed return status of boto_secgroup.absent()
2015-10-05 10:44:50 -06:00
Nicole Thomas
40f6cd8064 Merge pull request #27675 from avinassh/patch-1
Fix a typo
2015-10-05 08:50:44 -06:00
avinassh
e265ba8592 Fix a typo 2015-10-05 19:21:16 +05:30