Commit Graph

72203 Commits

Author SHA1 Message Date
Derek Schaller
07a7a14892 add silent flag to npm list 2016-07-29 22:14:16 -07:00
Derek Schaller
99e6458a20 fix invalid json formatter and general clean up 2016-07-29 22:14:16 -07:00
jmacfar
cb65f68740 Missing trailing whitespace after cmd 2016-07-29 21:54:40 -05:00
Mike Place
2144178ae0 Merge pull request #35066 from jfindlay/postgres_log
returners.postgres_local_cache: do not log in __virtual__
2016-07-29 19:32:17 -06:00
Erik Johnson
723b536eae Add documentation, release notes mention for new feature 2016-07-29 19:28:52 -05:00
Erik Johnson
bd4d1d31a0 Add nodegroup_comp unit tests 2016-07-29 19:28:52 -05:00
Erik Johnson
0c68da0601 Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
Resolves #35065.
2016-07-29 19:28:52 -05:00
Michael Lustfield
83de13edcb Adding zfsroot option to lxc-create.
Patch developed by Suitable Technologies.
2016-07-29 16:23:41 -07:00
Justin Findlay
c2c442234f returners.postgres_local_cache: do not log in __virtual__ 2016-07-29 13:03:36 -06:00
Erik Johnson
40cfa7cf17 Avoid needlessly running 2 argspecs in salt.utils.format_call()
Both format_call() and arg_lookup() perform an argspec, and
format_call() invokes arg_lookup(). This commit allows for an argpsec to
be passed into arg_lookup(), avoiding the need to perform the argspec a
second time.
2016-07-29 13:08:31 -05:00
twangboy
8e83757c78 Fix test_add_user_to_group 2016-07-29 12:07:14 -06:00
Thayne Harbaugh
5816463eae Corrections to proxy testing:
* Ensure that the --config_dir argument is passed when "verbatim_args" is set
* Ensure that the user option is set to "unknown" for both proxy and minion configurations
2016-07-29 11:57:54 -06:00
twangboy
35017d7241 Add useradd integration tests for Windows 2016-07-29 11:30:34 -06:00
Erik Johnson
e32644f275 Update state unit tests to use new orchestration_jid param 2016-07-29 12:17:59 -05:00
Erik Johnson
ef46751626 Explicitly load salt.utils.args 2016-07-29 12:17:59 -05:00
Erik Johnson
1f240c79f4 Fire events containing args for runner/wheel orchestration jobs
Also, fix a bug where runner/wheel funcs with a 'saltenv' param were
being stripped by salt.utils.format_call()
2016-07-29 12:17:58 -05:00
Erik Johnson
1ffec6aef4 Pass orchestration jid to orchestration jobs 2016-07-29 12:17:58 -05:00
Erik Johnson
f93322c19a Fire events containing args for state/function orchestration jobs 2016-07-29 12:17:58 -05:00
Erik Johnson
dd7baa6ed2 For orchestration jobs, include the jid in the pub data 2016-07-29 12:17:58 -05:00
Erik Johnson
4d17872792 Add orchestration jid, if present, to highstate execution 2016-07-29 12:17:58 -05:00
Erik Johnson
0256b5dbf9 Support passing orchestration jid into highstate 2016-07-29 12:17:58 -05:00
Erik Johnson
26a0850c19 Add utils func for firing an event containing orchestration args 2016-07-29 12:17:58 -05:00
Erik Johnson
e9b214e9f8 Allow for pub dict to be passed into _gen_async_pub() 2016-07-29 12:17:58 -05:00
Mike Place
ec821510bf Merge pull request #34909 from twangboy/int_tests_beacons
Add check for admin on Windows, gated
2016-07-29 10:39:28 -06:00
Mike Place
878e200cd9 Merge pull request #35008 from hu-dabao/fix-multimaster
Fix multimaster failover on more than two masters and failback behaviour
2016-07-29 10:34:36 -06:00
Mike Place
b0b2eabda9 Merge pull request #35012 from lubyou/let-win_dacl-accept-sids
Accept both user accounts and SID's in the win_dacl module.
2016-07-29 10:33:38 -06:00
Thomas S Hatch
82228b47d9 Initial Docker sls tutorial 2016-07-29 10:32:10 -06:00
twangboy
2cb5787bad Remove linux gate 2016-07-29 10:24:29 -06:00
twangboy
402901aff0 Add check for admin on Windows, gated 2016-07-29 10:20:45 -06:00
Mike Place
316ac62463 Merge pull request #35031 from bodhi-space/infra1589
INFRA-1589 - add several tagging related functions to boto_ec2 exec and state modules
2016-07-29 10:07:06 -06:00
Mike Place
bd5e2a3ed3 Merge pull request #35033 from UtahDave/fix_win_cpu_model
Fix cpu_model grain on Windows to actual CPU model
2016-07-29 10:06:25 -06:00
Mike Place
11ed147448 Merge pull request #35055 from galet/2016.3
#33536 pkgrepo.managed does not disable a yum repo with "disabled: True"
2016-07-29 09:40:15 -06:00
Mike Place
b057a57017 Merge pull request #35036 from techhat/fallback
Catch errors when attempting fallback
2016-07-29 09:13:21 -06:00
Denys Havrysh
19d080445b Add fun_args field to events generated by execution of Master modules 2016-07-29 18:03:09 +03:00
Mike Place
9f91c0d954 Merge pull request #35047 from bodhi-space/elasticache-bits
Add a couple of functions to boto_elasticache, and fix a bug I introduced awhile back
2016-07-29 08:53:03 -06:00
Mike Place
ebaee39b2b Merge pull request #35039 from whiteinge/module-run-saltenv
Add saltenv support to module.run
2016-07-29 08:01:03 -06:00
Mike Place
32ed78a399 Merge pull request #35046 from eliasp/2016.3-salt.states.network-prevent-backtrace
Prevent backtrace in `salt.states.network`
2016-07-29 07:59:09 -06:00
Mike Place
f34bb7a8de Merge pull request #35054 from lubyou/fix-win_dacl-disable_inheritance
Only fail user lookup is the user parameter is required
2016-07-29 07:58:41 -06:00
Galet, Michal
d70796bbfe
#33536 pkgrepo.managed does not disable a yum repo with "disabled: True"
- This fixes the pkgrepo state and yumpkg module for EL systems. The state was not working with enabled neither with disabled fields.
- Fixes the situation when the "disabled" was saved into the repo file. Internally works with "disabled" but saves "enabled".
2016-07-29 14:15:16 +02:00
Johannes Scholz
1e4e856fb2 Only fail user lookup is the user parameter is required
get() and check_inheritance() have an optional user parameter.
While said parameter is optional, the functions in questions
do not treat it as such, which at the very least breaks
disable_inheritance() (used by win_dacl.disableinheritance) and
enable_inheritance (used by win_dacl.enableinheritance), as those
functions call check_inheritance() without the user parameter.
2016-07-29 13:07:57 +02:00
Johannes Scholz
d1873075e0 make lint happy 2016-07-29 10:37:37 +02:00
Erik Johnson
fd186b7e4c Pass environment as 'saltdev' if runner/wheel func accepts a saltdev argument 2016-07-29 01:54:00 -05:00
Erik Johnson
951b52ab93 Pass __env__ from saltmod orch states to to saltutil.{runner,wheel} 2016-07-29 01:52:45 -05:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart
Introduce a template system for extending SaltStack open
2016-07-28 22:38:10 -06:00
Anthony Shaw
e32ba10365
add 2.6 support 2016-07-29 10:00:28 +10:00
Ben Hosmer
85d4cd377f Fix pylint errors 2016-07-28 19:48:18 -04:00
Tom Williams
3d9d137e98 Add boto_elasticache.{get_all,list}_cache_subnet_groups() and fix a bug I introduced 2016-07-28 19:40:34 -04:00
Elias Probst
1542cd5124
Prevent backtrace in salt.states.network
Prevents this backtrace:
```
  File "/usr/lib64/python2.7/site-packages/salt/state.py", line 1723, in call
    **cdata['kwargs'])
  File "/usr/lib64/python2.7/site-packages/salt/loader.py", line 1650, in wrapper
    return f(*args, **kwargs)
  File "/usr/lib64/python2.7/site-packages/salt/states/network.py", line 513, in system
    old = __salt__['ip.get_network_settings']()
  File "/usr/lib64/python2.7/site-packages/salt/loader.py", line 1053, in __getitem__
    func = super(LazyLoader, self).__getitem__(item)
  File "/usr/lib64/python2.7/site-packages/salt/utils/lazy.py", line 93, in __getitem__
    raise KeyError(key)
KeyError: 'ip.get_network_settings'
```
2016-07-29 01:36:05 +02:00
Anthony Shaw
39159cc6cb
add the salt deserializer 2016-07-29 09:29:17 +10:00
Tom Williams
f348963412 INFRA-1589 - oops, forgot and used dictionary comprehensions :) 2016-07-28 19:18:14 -04:00