Daniel Wallace
d3a556a6f3
remove old event that never got ran
2017-12-28 07:49:05 -07:00
Daniel Wallace
7d55924cf1
this makes this all work with syndics
...
Any help would be great here, for some reason the jid gets updated and changed
somewhere in here, but only when using a syndic.
2017-12-28 07:49:05 -07:00
Daniel Wallace
1ec73143db
dont pass syndic job lookups to ssh
2017-12-28 07:49:05 -07:00
Daniel Wallace
b866c5f55d
fix option name
2017-12-28 07:49:05 -07:00
Daniel Wallace
78c9b32bfe
only fire events for stuff that is dictionaries
2017-12-28 07:49:05 -07:00
Daniel Wallace
38aeb7ad5f
add enable_ssh documentation
2017-12-28 07:49:05 -07:00
Daniel Wallace
24541d464d
allow calling ssh minions from salt master process
2017-12-28 07:49:04 -07:00
rallytime
add0a827f9
Don't log in the __virtual__() space in gcp_addon module
...
Fixes #45182
2017-12-28 08:27:47 -05:00
Nicole Thomas
30d7f7257a
Merge pull request #44624 from eliasp/fix-upstart-utmp-exception
...
Fix Traceback when using the `service.enabled` state on non-booted systems
2017-12-28 05:58:42 -05:00
Nicole Thomas
f093fe1af0
Merge pull request #45095 from terminalmage/py3-loader
...
PY3: Make loader ignore .pyc files not in __pycache__
2017-12-27 18:23:35 -05:00
Nicole Thomas
8bd164c45b
Merge pull request #45184 from twangboy/win_add_libnacl_oxygen
...
Add libnacl dependency
2017-12-27 17:08:46 -05:00
Nicole Thomas
3832e7b227
Merge pull request #45183 from twangboy/win_add_libnacl_2017.7
...
Add libnacl dependency
2017-12-27 17:08:31 -05:00
Mihai Dinca
6970fe8103
Fix salt-master for old psutil
2017-12-27 16:40:50 -05:00
twangboy
afd95fa821
Add libnacl dependency
2017-12-27 13:43:23 -07:00
twangboy
b46845888d
Add libnacl dependency
2017-12-27 13:40:49 -07:00
Nicole Thomas
a532a6b7ba
Merge pull request #44890 from terminalmage/salt.cmd-runner
...
Add grains (and optionally pillar) to salt.cmd runner
2017-12-27 14:04:50 -05:00
Nicole Thomas
29eae303f7
Merge pull request #45148 from terminalmage/json.dumps
...
Replace json module usage with a helper to ensure unicode content is handled properly
2017-12-27 13:51:03 -05:00
Nicole Thomas
d3381e27d0
Merge pull request #45118 from garethgreenaway/44728_nodegroups_seq
...
[2016.11] Fix to allow nodegroups to include sequences
2017-12-27 13:49:10 -05:00
Nicole Thomas
42185b79b8
Merge branch 'oxygen' into py3-loader
2017-12-27 13:42:44 -05:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly
...
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
2017-12-27 09:30:58 -06:00
Nicole Thomas
66e090e75d
Merge pull request #45113 from twangboy/win_fix_fcgrain
...
Fix a stack trace in grains.core
2017-12-27 09:36:49 -05:00
Nicole Thomas
0f0ddf2d31
Merge pull request #45158 from terminalmage/fix-exclude-test
...
Fix integration.modules.test_state.StateModuleTest.test_exclude
2017-12-27 09:21:20 -05:00
lomeroe
0a4c6b5a83
remove references to six.unichr
2017-12-24 20:23:24 -06:00
Erik Johnson
a73c380341
Don't use include-test SLS in orch tests
...
This was the _actual_ cause of the failing test in the state module
integration tests.
2017-12-24 12:49:45 -06:00
Erik Johnson
4bf072435d
Fix integration.modules.test_state.StateModuleTest.test_exclude
...
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.
This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
2017-12-24 12:08:57 -06:00
lomeroe
f3196d795d
lint fixes for static regexes
2017-12-24 10:49:42 -06:00
lomeroe
11b637d108
lint fixes
...
encode some of the more used characters in variables and re-use instead
of re-encoding them over and over
remove a line that was commented out
2017-12-24 10:49:42 -06:00
lomeroe
c14d6282ad
do not decode registry.pol file wholesale, but instead decode individual
...
elements of the file
also fix issue where the get_policy_info function would not find
policies in the policy_data class by their "short" name (i.e. the key
name in the dict)
2017-12-24 10:49:42 -06:00
Erik Johnson
14c8979cb6
Merge pull request #45153 from terminalmage/fix-docker-unit-test
...
Update mocking in unit.grains.test_core.CoreGrainsTestCase.test_docker_virtual
2017-12-24 09:23:41 -06:00
Erik Johnson
d9a915fdc9
Update mocking in unit.grains.test_core.CoreGrainsTestCase.test_docker_virtual
...
This fixes this test in Oxygen, where the function name has changed.
2017-12-23 19:47:37 -06:00
Erik Johnson
3a7825618c
Fix master-side ckminions check
2017-12-23 09:19:03 -06:00
Erik Johnson
3b4b9335c3
Clarify docstring
2017-12-23 09:19:03 -06:00
Erik Johnson
bc307964d9
Add grains (and optionally pillar) to salt.cmd runner
...
Not having grains was an oversight, it causes a lot of errors in
processing the __virtual__ functions. Additionally, the __pillar__
dunder did not exist, so anything that referenced it would result in a
traceback.
2017-12-23 09:19:03 -06:00
Elias Probst
43d44e051a
Do not blindly assume presence of either /var/run/utmp or /run/utmp, none of both might be available (e.g. on non-booted systems).
2017-12-23 00:34:07 +01:00
Nicole Thomas
16a097635a
Merge pull request #44991 from isbm/isbm-sql-pillar-bugfix
...
SQL Pillar bugfix
2017-12-22 16:54:19 -05:00
Nicole Thomas
1e1dfdadc0
Merge pull request #45144 from jasperla/joyent/keyname
...
update the default configuration for joyent with a keyname
2017-12-22 16:04:26 -05:00
Nicole Thomas
fbbf33574e
Merge pull request #44966 from rcallphin/fix-bug-vault-empty-policy
...
Fix bug with vault runner creating token on empty policy
2017-12-22 15:30:36 -05:00
Nicole Thomas
7f327ab760
Lint: Remove extra whitespace
2017-12-22 14:30:28 -05:00
Nicole Thomas
487207f61d
Merge pull request #44552 from Da-Juan/avoid_unneeded_pip_install
...
pip_state: Check if available upgrades fulfill version requirements.
2017-12-22 14:25:16 -05:00
Jasper Lievisse Adriaanse
e1bfb804de
update the default configuration for joyent with a keyname
...
this parameter is mandatory as otherwise the user is presented with
a puzzling HTTP 401
2017-12-22 20:09:45 +01:00
Nicole Thomas
f39731fab0
Merge branch 'oxygen' into isbm-sql-pillar-bugfix
2017-12-22 13:45:48 -05:00
Nicole Thomas
5ae26f0c09
Merge pull request #45090 from angeloudy/2017.7
...
fix TypeError in python 3
2017-12-22 13:11:12 -05:00
Nicole Thomas
a1946730a9
Merge pull request #45134 from garethgreenaway/44315_cmd_script_cwd_with_space
...
[2017.7] fix to cmd.script for cwd with space
2017-12-22 10:31:24 -05:00
Nicole Thomas
b0a23548f3
Merge pull request #45088 from twangboy/win_custom_config
...
Add `/custom-config` switch to Windows installer
2017-12-22 10:19:59 -05:00
Nicole Thomas
f969aca3a3
Merge pull request #45127 from twangboy/win_fix_pkg
...
Fix issue with 1641 return code
2017-12-22 10:18:27 -05:00
Nicole Thomas
dc357b39f0
Merge pull request #45137 from twangboy/win_fix_reg_tests
...
Catch correct error type in list_keys and list_values
2017-12-22 09:45:21 -05:00
Nicole Thomas
e643de6545
Merge pull request #43892 from terminalmage/lock-mountpoints
...
Fix a race condition with git_pillar mountpoints
2017-12-22 09:38:40 -05:00
Nicole Thomas
f978bf3944
Merge pull request #45131 from rallytime/merge-oxygen
...
[oxygen] Merge forward from 2017.7 to oxygen
2017-12-22 09:35:02 -05:00
twangboy
b6f4ef8d73
Catch correct error type in list_keys and list_values
2017-12-21 18:44:23 -07:00
Gareth J. Greenaway
48eafe3206
Adding some tests to tests cmd.script with cwd
2017-12-21 15:53:38 -08:00
