Commit Graph

68687 Commits

Author SHA1 Message Date
Mike Place
1f8a0fd1e7 Merge pull request #35059 from vutny/event-function-args
Add `fun_args` field to events generated by execution of Master modules
2016-08-01 07:01:42 -06:00
Mike Place
d137c4b986 Merge pull request #34955 from lubyou/fix-dism-on-non-english-systems
force dism to always output english text
2016-08-01 06:54:03 -06:00
Mike Place
ff7ddf0b68 Merge pull request #35078 from jacobweinstock/fix-missing-non-keyword-argument
added missing non-keyword argument skip_verify to __get_artifact func…
2016-08-01 06:22:47 -06:00
Jacob Weinstock
c40314ba80 added missing non-keyword argument skip_verify to __get_artifact function 2016-07-30 13:32:38 -06:00
Johannes Scholz
63c974a3d0 add missing comma 2016-07-30 11:01:45 +02: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
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
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
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
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
Seth House
7ef287e09e Add saltenv support to module.run
This kwarg gets stripped by the state compiler before this function is
ever invoked.
2016-07-28 15:54:31 -06:00
Nicole Thomas
bee303db51 Merge pull request #35029 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-28 12:01:35 -06:00
rallytime
65f9365ee0 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-28 11:05:54 -06:00
Erik Johnson
3520757845 Don't add '.' to strerror when passed string ends in ? or ! (#35021)
* Don't add '.' to strerror when passed string ends in ? or !

This keeps the formatted exception string from needlessly containing a
'.' if the sentence ended in a different punctuation mark.

* Better handle cases in which exception was raised w/empty message
2016-07-28 10:21:01 -06:00
Hengyang Hu
12da890910 Fix multimaster failover on more than two masters and failback behaviour 2016-07-27 16:12:36 -07:00
Nicole Thomas
2b511f3013 Merge pull request #35000 from rallytime/bp-33875
Back-port #33875 and #34999 to 2015.8
2016-07-27 15:55:58 -06:00
Elias Probst
32d0f392da modules.slack.post_message: Allow sending messages to direct-message channels (name starting with @) (#34983) 2016-07-27 15:20:24 -06:00
rallytime
35696ad637 Pylint fix 2016-07-27 15:12:41 -06:00
Mike Place
f9fd6ddd8a Fixup #33875 2016-07-27 13:25:59 -06:00
Eu
56b1f6c651 Fix naive fileserver map diff algorithm
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.
2016-07-27 13:24:19 -06:00
Mike Place
05cfb1cefc Merge pull request #34996 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-27 13:03:04 -06:00
Nicole Thomas
837bc6ba7d Merge pull request #34994 from rallytime/bp-34835
Back-port #34835 to 2015.8
2016-07-27 12:21:10 -06:00
rallytime
a7d4f93697 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/integration/__init__.py
2016-07-27 11:35:16 -06:00
Elias Probst
d96386d162 salt.states.slack: check correct result attribute (#34987)
* The Slack execution module doesn't simply return a boolean to indicate
success/failure, but returns `True` in case of success and a dictionary
in case of failure which contains a `res` (boolean) and `message`.

This addresses the varying types returned by the execution module and
properly handles failure cases now instead of simply indicating success
on state execution.

Even before 69afcc4 only `result` was checked, but not its `res`
attribute.

Signed-off-by: Elias Probst <elias@grammofy.com>

* Consistent error msg formatting

Signed-off-by: Elias Probst <elias@grammofy.com>
2016-07-27 11:32:12 -06:00
Thomas S Hatch
9268a793de same thing for the mine in salt-ssh 2016-07-27 11:27:51 -06:00
Thomas S Hatch
3e11e19714 Fix the mine in salt ssh 2016-07-27 11:27:51 -06:00
Mike Place
edeb0eda36 Merge pull request #34835 from thatch45/34526_
Make the mine and publish combine minion and master opts in salt-ssh
2016-07-27 11:25:26 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout
SSH timeout
2016-07-27 11:24:37 -06:00
Mike Place
5f8370ae8d Refine errors in client (#34976)
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
2016-07-27 11:05:31 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
Nicole Thomas
721e6dcce8 Merge pull request #34988 from rallytime/release-notes-update
Update release notes with new changes
2016-07-27 09:54:15 -06:00
rallytime
a2aae987a6 Update release notes with new changes 2016-07-27 09:53:19 -06:00
Mike Place
d63ac1671c Merge pull request #34946 from alprs/fix-venv_reqs_subdir
Fix virtualenv behavior when requirements files are in subdirectories
2016-07-27 08:43:27 -06:00
Andreas Lutro
f773d63cbb normalize requirements path to be absolute 2016-07-27 14:00:16 +02:00
Mike Place
a83cdf9339 Merge pull request #34831 from thatch45/recoverssh
If the thin does not match, then redeploy, don't error
2016-07-26 16:27:01 -06:00
Mike Place
f765faa3aa Merge pull request #34957 from sjmh/2016.3
Don't fall through to checking auth entries
2016-07-26 16:16:17 -06:00
Mike Place
2d3b95dec9 Merge pull request #34971 from cachedout/increase_timeout_grains_test
Increase timeout for grains test
2016-07-26 16:11:29 -06:00
Mike Place
82d271b43a Increase timeout for grains test 2016-07-26 16:10:30 -06:00
Johannes Scholz
775ea73578 fix unit tests 2016-07-26 19:46:14 +02:00
Mike Place
f23e8c525e Merge pull request #34951 from vutny/fix-schedule-dateutil
Fix #34873
2016-07-26 11:07:47 -06:00
Mike Place
deb1331601 Merge pull request #34935 from rallytime/beacons-mod-cleanup
Avoid UnboundLocalError in beacons module
2016-07-26 11:01:23 -06:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Steve Hajducko
0095dbe530 Don't fall through to checking auth entries
Need to skip checking for matchers when using single string matchers like @runner or @jobs
2016-07-26 09:43:41 -07:00
Denys Havrysh
0faa490991 Fix job scheduling using `when parameter (by python-dateutil`) 2016-07-26 17:37:28 +03:00
Johannes Scholz
51869807f1 force dism to always output english text
DISM on localized versions of Windows (French, for example) return
localized output, which breaks the DISM module, as it relies on
English text.
2016-07-26 15:45:44 +02:00