Commit Graph

59981 Commits

Author SHA1 Message Date
Nicole Thomas
e47d849af6 Merge pull request #27704 from jacobhammons/26604
Update compound matcher docs to clarify the usage of alternate delimi…
2015-10-05 23:36:55 -06:00
Nicole Thomas
c58da846bf Merge pull request #27706 from jacobhammons/bug-fixes
Assorted doc bugs
2015-10-05 23:35:29 -06:00
Stephen Woodrow
509ded1bd0 Fix some tests. 2015-10-05 20:57:17 -07:00
Jacob Hammons
76dc8de71b Assorted doc bugs
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Nicole Thomas
2491ce40f1 Merge pull request #27705 from rallytime/merge-27602
Merge #27602 with final pylint fix
2015-10-05 17:36:50 -06:00
rallytime
81aad83386 Ignore import error 2015-10-05 17:35:31 -06:00
Jacob Hammons
1c51ce28a9 Update compound matcher docs to clarify the usage of alternate delimiters
Refs #26604
2015-10-05 17:29:39 -06:00
Colton Myers
fadb954676 Use new method for injecting globals into state functions 2015-10-05 17:07:45 -06:00
Colton Myers
17b267470a Add decorator for injecting globals into functions in the loader
Override LazyLoader __getitem__ to wrap the function if globals are
defined for wrapping
2015-10-05 17:06:40 -06:00
Joseph Hall
b76eb08c68 Merge pull request #27691 from notpeter/iam_fail_faster
Faster timeout (3s vs 2min) for instance metadata lookups. #13850.
2015-10-05 16:55:52 -06:00
C. R. Oldham
fc78f49dc5 Merge pull request #27696 from blueyed/load-proxy-call-_module_dirs-only-once
loader.proxy: call `_modules_dirs` only once
2015-10-05 16:42:32 -06:00
rallytime
a2e547ba3d Clean up linode if statements to be more clear 2015-10-05 16:21:38 -06:00
Daniel Hahler
561dc4cf94 dockerng: fix/enhance version warning in __virtual__
Currently the call to `log.warning` will throw an error, because
`str.join` expects strings, not numbers.

This commit fixes it and also handles a mismatching docker-py version
more appropriate by returning a tuple instead of logging warnings
(hinted via https://github.com/saltstack/salt/pull/27602#discussion_r41057751).
2015-10-06 00:20:26 +02: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
Colton Myers
43fba89865 Merge pull request #27695 from rallytime/bp-27671
Back-port #27671 to 2015.5
2015-10-05 15:57:36 -06:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine
Expose container_id in mine.get_docker
2015-10-05 15:56:53 -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
Colton Myers
8453cb3eb1 Merge pull request #27600 from blueyed/dockerng-auto-version
dockerng: use docker.version=auto by default
2015-10-05 15:29:14 -06: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
Colton Myers
cb3d92676e Merge pull request #27524 from jfindlay/pkgng_quiet
parse pkgng output in quiet mode for >= 1.6.1
2015-10-05 15:22:40 -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
Colton Myers
5b88c55cc3 Merge pull request #27686 from rallytime/bp-27476
Back-port #27476 to 2015.5
2015-10-05 15:17:59 -06:00
Colton Myers
f9ddd4647f Merge pull request #27684 from rallytime/bp-27656
Back-port #27656 to 2015.5
2015-10-05 15:17:55 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448
Merge #27448 with test fixes
2015-10-05 15:17:41 -06:00
Colton Myers
7ca6f854ff Merge pull request #27683 from rallytime/bp-27659
Back-port #27659 to 2015.5
2015-10-05 15:17:30 -06:00
Colton Myers
a0f3e34656 Merge pull request #27682 from rallytime/bp-27566
Back-port #27566 to 2015.5
2015-10-05 15:17:26 -06:00
Colton Myers
0b9ba911c4 Merge pull request #27681 from rallytime/bp-25928
Back-port #25928 to 2015.5
2015-10-05 15:17:19 -06:00
Colton Myers
23da0d316a Merge pull request #27680 from rallytime/bp-27535
Back-port #27535 to 2015.5
2015-10-05 15:17:10 -06:00
Daniel Hahler
55a76be6c1 loader.proxy: call _modules_dirs only once
Instead of assigning it to an unused variable, pass the function's
return value to LazyLoader directly.
2015-10-05 23:07:40 +02:00
Nicole Thomas
4ddc87157a Merge pull request #27693 from jacobhammons/doc-updates
initial engines topic, updates to windows repo docs
2015-10-05 15:05:26 -06:00
Jacob Hammons
5a3e72fc8e __ops__ to __opts__ 2015-10-05 15:00:56 -06:00
Oleg Gashev
2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist.
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.
2015-10-05 14:47:25 -06: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
Nicole Thomas
f7f48d1eef Merge pull request #27601 from blueyed/dockerng-none-names
dockerng: handle None in container.Names
2015-10-05 14:32:19 -06:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs
Refs #23239
Refs #27520
2015-10-05 14:22:59 -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
Erik Johnson
3ffb5a3369 Merge pull request #27596 from blueyed/fix-gitfs-UnboundLocalError
gitfs: fix UnboundLocalError for 'msg'
2015-10-05 15:18:00 -05: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
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
Peter Tripp
3d9483b4e2 Faster timeout (3s vs 2min) for instance metadata lookups. #13850. 2015-10-05 12:17:59 -07: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