valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,080 Commits 24 Branches 182 Tags 341 MiB
17b267470a
Commit Graph

58080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Nicole Thomas
4d7be3f972 Merge pull request #27651 from eliasp/2015.8-cloud.clouds.ec2-check-for-subnetId-before-using-it 
Check for existence of 'subnetId' key in subnet dict
 2015-10-05 11:01:33 -06:00
C. R. Oldham
d9266505a7 Merge pull request #27639 from rallytime/fix-23370 
Docement version added for new artifactory options
 2015-10-05 11:01:21 -06:00
Nicole Thomas
771e5136f1 Merge pull request #27677 from rallytime/bp-27675 
Back-port #27675 to 2015.8
 2015-10-05 09:47:34 -06:00
avinassh
bfa0acfbfe Fix a typo 2015-10-05 08:58:51 -06:00
Nicole Thomas
6bc5ddc561 Merge pull request #27637 from rallytime/bp-27604 
Back-port #27604 to 2015.8
 2015-10-05 08:54:59 -06:00
Nicole Thomas
905acc6229 Merge pull request #27657 from garethgreenaway/19291_pkg_state_latest_fix 
Fix to pkg state module
 2015-10-03 17:56:02 -06:00
Gareth J. Greenaway
c950527b24 When latest is passed in the state as the version to install, once the package is installed the state runs will fail. pkg.latest_version returned an empty string once the package is installed so we need to grab the installed version in that case to avoid passing an empty string to the pkg module in question. 2015-10-03 10:07:54 -07:00
Elias Probst
f21a763809
Check for existence of 'subnetId' key in subnet dict 2015-10-03 14:01:42 +02:00
rallytime
6de99bd5b7 Docement version added for new artifactory options 
Fixes #23370
 2015-10-02 14:15:28 -06:00
Nicolas Delaby
7293ded2f6 fixup! Expose container_id in mine.get_docker 2015-10-02 21:34:51 +02:00
Thayne Harbaugh
3d2ee4297d Fix module path to SaltCacheError 
* salt.exception.SaltCacheError => salt.exceptions.SaltCacheError
                                                    ^
 2015-10-02 13:31:20 -06:00
Nicolas Delaby
9e56a7e9db Expose container_id in mine.get_docker 
Because sometimes we should be able to perform additional introspection.
 2015-10-02 21:30:33 +02:00
Mike Place
83ae6a1432 Merge pull request #27632 from rallytime/bp-27539 
Back-port #27539 to 2015.8
 2015-10-02 13:28:39 -06:00
Mike Place
888e9bdf5d Merge pull request #27633 from rallytime/bp-27559 
Back-port #27559 to 2015.8
 2015-10-02 13:22:07 -06:00
Joseph Hall
8b7da5e469 Merge pull request #27579 from rallytime/fix-27463 
Change boto_route53 region default to 'universal' to avoid problems with boto library
 2015-10-02 12:56:17 -06:00
Ethan Moore
3f03815ada rebasing 2015-10-02 09:53:59 -06:00
rallytime
2b0afd0230 Add versionadded to new path option 2015-10-02 09:51:06 -06:00
Ethan Moore
e54afed73a moving path kwarg to end of function definition 
added back debug entries that I removed previously
 2015-10-02 09:50:24 -06:00
Nicole Thomas
ce4c64a2e3 Merge pull request #27581 from tkwilliams/boto_secgroup_add_vpc_name 
Add support for 'vpc_name' tag in boto_secgroup module and state
 2015-10-02 09:40:40 -06:00
Mike Place
fb6f6b9ce4 Merge pull request #27624 from eyj/fix_wait_for_sync 
Wait for sync is not passed to boto_route53 state
 2015-10-02 09:37:44 -06:00
Mike Place
eb59cb8d1c Merge pull request #27614 from blueyed/doc-minor 
doc: minor fixes to doc and comments
 2015-10-02 09:34:02 -06:00
Mike Place
61f8a6f39f Merge pull request #27627 from eyj/pr-instance-attribute 
Fix crash in boto_asg.get_instances if the requested attribute is None
 2015-10-02 09:33:32 -06:00
EYJ
03d7c6af3d Fix crash in boto_asg.get_instances if the requested attribute may be None 2015-10-02 15:34:38 +02:00
Nasenbaer
ed6a8c0aa6 Wait for sync is not passed to boto_route53 state 2015-10-02 15:16:31 +02:00
jacobhammons
764d70af79 Merge pull request #27616 from jacobhammons/win-repo-docs 
Updated windows software repository docs
 2015-10-01 23:04:37 -06:00
Jacob Hammons
1c8b32ce26 Updated windows software repository docs 2015-10-01 22:02:01 -06:00
Tom Williams
159cccf43f Faulty check logic around optional params 2015-10-01 22:52:36 -04:00
Tom Williams
84ab0bbd74 One last bug to squash. Seriously. It's the last one. Ever! 
- fixed param vpc_id being passed where vpc_name was intended.
 2015-10-01 22:12:19 -04:00
Tom Williams
002cbf5cde Grrr. Add back the import of SaltInvocationError that pylint wanted me to remove :) 2015-10-01 21:48:13 -04:00
Tom Williams
0671c0d8d9 Consolidate some redundant code - thanks @ryan-lane ! 2015-10-01 20:57:44 -04:00
Tom Williams
fae1199276 Followed @ryan-lane's suggestion to remove duplicated code from boto_vpc and instead call into that module 2015-10-01 20:11:50 -04:00
Daniel Hahler
98a8c0f055 doc: minor fixes to doc and comments 2015-10-02 01:18:32 +02:00
Tom Williams
3a38a440b7 Merge remote-tracking branch 'upstream/2015.8' into boto_secgroup_add_vpc_name 2015-10-01 17:32:13 -04:00
Tom Williams
f7ef0bcd4c Fixups for picayune pylint pedantery :) 2015-10-01 16:29:57 -04:00
Daniel Hahler
b1442ac904 dockerng: handle None in container.Names 
`Names` might be `None`, and would cause this error:

    [ERROR   ] An exception occurred in this state: Traceback (most recent call last):
      File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1591, in call
        **cdata['kwargs'])
      File "/usr/lib/python2.7/dist-packages/salt/states/dockerng.py", line 1386, in running
        if name not in __salt__['dockerng.list_containers'](all=True):
      File "/usr/lib/python2.7/dist-packages/salt/modules/dockerng.py", line 2136, in list_containers
        for c_name in [x.lstrip('/') for x in item.get('Names', []) or []]:
    TypeError: 'NoneType' object is not iterable

    > /usr/lib/python2.7/dist-packages/salt/modules/dockerng.py(2136)list_containers()
       2135     for item in six.itervalues(ps_(all=kwargs.get('all', False))):
    -> 2136         for c_name in [x.lstrip('/') for x in item.get('Names', [])]:
       2137             ret.add(c_name)

    ipdb> item.get('Names') is None
    True
    ipdb> item
    {u'Status': u'Dead', u'Image': u'gliderlabs/logspout:v2', …
    u'Names': None, … }
 2015-10-01 19:32:18 +02:00