Commit Graph

92108 Commits

Author SHA1 Message Date
Daniel A. Wozniak
082b8d0b3d
Use salt.utils.platform 2018-04-25 08:36:32 -07:00
Nicole Thomas
0d9d55e013
Merge pull request #47106 from DSRCorporation/bugs/tornado50
Tornado50 compatibility fixes
2018-04-25 11:32:36 -04:00
Daniel A. Wozniak
717abedaf7
Fix comman wart 2018-04-25 08:31:07 -07:00
Ch3LL
daa68b4877
Add virtual grains test for core grains 2018-04-25 11:03:35 -04:00
Nicole Thomas
205701dcbe
Merge pull request #47038 from garethgreenaway/46977_fixing_fileclient_forward_compatibilty
[2018.3] fix to fileclient.py
2018-04-25 10:57:03 -04:00
Nicole Thomas
89daf4fdc7
Merge pull request #47060 from OrlandoArcapix/Issue47059-return_dict_from_state
Return an empty dict for 'changes' instead of 'None'
2018-04-25 10:55:23 -04:00
Nicole Thomas
10cc0d312b
Merge pull request #47153 from terminalmage/issue47089
salt.modules.ssh: properly encode/decode I/O
2018-04-25 10:53:51 -04:00
Nicole Thomas
2e014f4746
Merge pull request #47271 from gtmanfred/amazon
load rh_service for amazon linux not booted with systemd
2018-04-25 10:47:05 -04:00
Nicole Thomas
599b0ed1e9
Merge pull request #47246 from cloudflare/fix-44847-2017.7
Attempting to fix #44847: allow a different way to get the test and debug flags into the netconfig state
2018-04-25 10:44:01 -04:00
Nicole Thomas
4e2e1f0719
Merge pull request #47220 from benediktwerner/fix-pip-2017.7
Fix pip.installed when no changes occurred with pip >= 1.0.0
2018-04-25 10:23:49 -04:00
Ch3LL
a59dd2785d
Remove dead code in core grains file for virt-what 2018-04-25 10:22:56 -04:00
Daniel Wallace
7c212cbb2d
fix pylint 2018-04-25 08:59:25 -05:00
Nicole Thomas
b5d64f1a70
Merge pull request #47275 from terminalmage/issue47199
Fix false failure events sent when using syndic
2018-04-25 09:56:46 -04:00
Nicole Thomas
0bcb1a079a
Merge branch '2018.3' into netbsdswap 2018-04-25 09:55:25 -04:00
Nicole Thomas
6215a995d8
Merge pull request #47284 from skjaro/beacon_diskusage_doc_fix
Fix beacon diskusage documentation for the new beahavior mentioned in issue #47267
2018-04-25 09:52:29 -04:00
Nicole Thomas
3ef4fe6ed2
Merge pull request #47291 from bosatsu/fix-proxy-minion-beacon-doc
Fix proxy minion beacon doc
2018-04-25 09:42:35 -04:00
Nicole Thomas
ea2d68b865
Merge pull request #47255 from garethgreenaway/47239_fixes_to_salt_proxy_beacon
[2018.3] Fixes to salt_proxy beacon and beacon tests
2018-04-25 09:41:50 -04:00
Nicole Thomas
92e606251f
Merge pull request #47272 from rallytime/reg-windows-codeowners
Add windows tests and reg module/state to CODEOWNERS file for team-windows
2018-04-25 09:25:28 -04:00
Daniel A. Wozniak
cc2538e08f
The grp modules is not available on windows 2018-04-25 00:23:20 -07:00
Daniel A Wozniak
4100dcd64c
Close might get called more than once
Since close can be called more than once handle and log exceptions
2018-04-24 23:52:13 -07:00
Daniel Wozniak
19f9e8258f
Merge pull request #47292 from dwoz/cp_fix_again
Fix decorator wart
2018-04-24 21:25:23 -07:00
Daniel A Wozniak
dbe671f943
Stop socket before queue on delete 2018-04-24 19:24:03 -07:00
Daniel A. Wozniak
7d045eb235
Fix decorator wart 2018-04-24 19:09:08 -07:00
Scott Page
01980b4c43
Fix topics/releases/2018.3.0.rst to include correct example of proxy_example beacon yaml configuration. 2018-04-25 10:12:00 +09:00
Scott Page
9682e26eec
Fix topics/proxyminion/beacon.rst to include correct example of salt_proxy beacon yaml configuration. 2018-04-25 10:10:21 +09:00
Daniel A. Wozniak
9587f5c69e
Silence pylint import-error for six.moves 2018-04-24 17:21:30 -07:00
Daniel Wozniak
da532aa1ac
Merge pull request #47285 from dwoz/core_test_fix
Fix reg grains test
2018-04-24 17:16:55 -07:00
Daniel Wozniak
f591cff643
Merge pull request #47290 from dwoz/test_cp_fix
Run cache_master test in tmp dir
2018-04-24 16:37:20 -07:00
Daniel A. Wozniak
4b0c7d3b34
Fix typo 2018-04-24 16:17:14 -07:00
Daniel A. Wozniak
884f4c1829
Fix extra space 2018-04-24 16:15:11 -07:00
Daniel A. Wozniak
05adf7c2b1
Use six.moves for queue import 2018-04-24 15:18:36 -07:00
Daniel A Wozniak
8a9027c0c9
Fix reg grains test 2018-04-24 15:05:43 -07:00
Daniel A. Wozniak
5ff51affbd
Run cache_master test in tmp dir 2018-04-24 14:58:20 -07:00
Nicole Thomas
6d323aa8f0
Merge pull request #47250 from terminalmage/issue47092
Fix virtual package detection
2018-04-24 15:22:23 -04:00
Ch3LL
ced7f86546
Add windows ntp integration module tests 2018-04-24 15:12:58 -04:00
Jaro
fcc042aa5f Fix beacon documentation for the new beahavior mentioned in issue #47267 2018-04-24 21:03:40 +02:00
Ch3LL
c9181a75a6
Add destructivetest decorator on tests 2018-04-24 14:44:15 -04:00
Daniel Wallace
6754787e8e
update localemod tests 2018-04-24 13:38:46 -05:00
Ch3LL
0d0c8987fc
Add win_system integration module tests 2018-04-24 14:37:14 -04:00
Daniel Wallace
9075070573
make sure not to send invalid information
Localectl outputs n/a sometimes when stuff is not set, instead of just not
outputting anything.  Actually put None in the variable when parsing it, and do
not add it to the localectl set command.
2018-04-24 13:36:21 -05:00
Daniel A Wozniak
fe340778fa
Gracefully shutdown worker threads 2018-04-24 10:21:43 -07:00
Morgan Willcock
30478e8c9c Use swapctl for NetBSD 2018-04-24 17:29:13 +01:00
Erik Johnson
8012ad12f8
Fix false failure events sent when using syndic
To properly report on nodegroup minions which failed to return, the
master reports minions which don't match the target expression as
"missing". Later, when aggregating returns and writing them to the CLI,
failure events are fired for minions which were reported as missing.

The problem with this approach is that the lower-level minions do not
subscribe directly to the master-of-masters, and thus they are always
marked as missing.

To keep from falsely reporting them as missing, this commit filters out
any minion IDs for which a return was received, so that we only report
on minions which actually failed to return.
2018-04-24 10:31:17 -05:00
Gareth J. Greenaway
a2a8d78cb0
Fixing status beacon tests. 2018-04-24 08:00:06 -07:00
Gareth J. Greenaway
c87d6cae23
Ensure the salt_proxy is returning the correct tuple when the configuration is valid. Update various beacon unit tests to ensure they are testing the results of the validate function for a True result. 2018-04-24 08:00:06 -07:00
rallytime
9445af0185
Add windows tests and reg module/state to CODEOWNERS file for team-windows
`team-windows` should be requested for reviews whenever a windows test file
or the reg.py execution module and accompanying reg.py state file are edited.
2018-04-24 10:32:51 -04:00
Nicole Thomas
9dca5c0221
Merge pull request #47252 from rallytime/codeowners-fixes
Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns
2018-04-24 10:10:41 -04:00
Daniel Wallace
8a53908908
Do not load rh_service module when booted with systemd
Amazon continues to release versions of Amazon Linux 1, which boots with
rh_service, but also Amazon linux 2, and both with the same versioning scheme,
so we cannot depend on the date for making decisions here.
2018-04-24 09:09:03 -05:00
Daniel Wallace
e4d1d5bf11
Revert "support amazon linux 2 for service module"
This reverts commit 37e067c7b5.
2018-04-24 09:08:51 -05:00
Nicole Thomas
3de1bb49c8
Merge pull request #47177 from fpicot/fix_47173_pkg_normalize
fix normalize parameter in pkg.installed
2018-04-24 09:37:53 -04:00