valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,961 Commits 24 Branches 182 Tags 341 MiB
191235d8d3
Commit Graph

14255 Commits

Author SHA1 Message Date
Erik Johnson
191235d8d3
Remove custom grains module from 2018.3 branch 
Support for passing the grains data to custom grains modules wasn't
added until the 2019.2 release cycle. It seems like this file was
included when something else was backported to 2018.3.
 2019-01-31 09:10:45 -06:00
Gareth J. Greenaway
bd41ff0f59
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3 2019-01-30 11:01:06 -05:00
Daniel Wozniak
43a9d2f972
Merge pull request #51338 from Ch3LL/bp-51207 
Backport #51207 into 2018.3.4
 2019-01-27 16:44:58 -07:00
Daniel Wozniak
4e855050e8
Merge branch '2018.3.4' into bp-51170 2019-01-27 16:44:10 -07:00
Daniel Wozniak
7656aa5f66
Merge pull request #51340 from Ch3LL/bp-51252 
Backport #51252 into 2018.3.4
 2019-01-27 16:42:48 -07:00
Daniel A. Wozniak
e74a6c61de
Fix py3 managed.file test failure 2019-01-25 14:42:50 -05:00
Daniel A. Wozniak
824950c4cd
Fix 50221 regression test on Windows 2019-01-25 14:42:38 -05:00
Daniel A. Wozniak
1840af9c00
peserve newlines from pillar data for file.managed 2019-01-25 14:42:32 -05:00
twangboy
345ae676b6
Backport PR# 50771 to 2018.3 branch 2019-01-25 14:38:30 -05:00
Daniel A. Wozniak
c893dc445a
Fix saltmod roster test 2019-01-25 14:32:58 -05:00
Daniel A. Wozniak
484bab4399
Fix linter 2019-01-25 14:32:42 -05:00
Daniel A. Wozniak
5e2db2f7af
Honor roster file for ssh orchestrations 2019-01-25 14:32:36 -05:00
Pedro Algarvio
da3aace317
Merge branch '2018.3.4' into hotfix/fix-network 2019-01-25 15:14:24 +00:00
twangboy
f4177e0adb
Remove mode parameter on Windows 2019-01-24 10:11:48 -07:00
Gareth J. Greenaway
53ba0689a8
When test=True and there are permissions changes, report it. 2019-01-23 14:06:31 -05:00
Pedro Algarvio
04f16b8c91
Fix tests. We no longer get ipaddress instances back. 2019-01-23 18:07:25 +00:00
Thomas S Hatch
1abffb20b9
Merge pull request #51278 from dwoz/issue51248 
Warn about proper validation option
 2019-01-22 15:13:12 -07:00
Daniel A. Wozniak
c614198477
Use pillar roots validation method 2019-01-22 12:19:06 -07:00
Daniel A. Wozniak
0d2b0c635f
Fix linter warnings 2019-01-22 10:40:57 -07:00
Daniel A. Wozniak
5b98895588
Fix wart in pillar_roots validation 
Adds tests for pillar and file roots validation
 2019-01-22 10:23:08 -07:00
Mathieu Parent
f9437e2590
Test for file_roots envs with slash leads to "No such file or directory" 
See #51211.

2019-01-08 09:57:23,653 [salt.master      :1795][ERROR   ][28091] Error in function _file_list:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/master.py", line 1788, in run_func
    ret = getattr(self, func)(load)
  File "/usr/lib/python2.7/dist-packages/salt/utils/decorators/__init__.py", line 594, in wrapped
    **salt.utils.data.decode_dict(kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 752, in file_list
    ret.update(self.servers[fstr](load))
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 422, in file_list
    return _file_lists(load, 'files')
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 310, in _file_lists
    __opts__, form, list_cache, w_lock
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 122, in check_file_list_cache
    if not os.path.isfile(list_cache) and _lock_cache(w_lock):
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 56, in _lock_cache
    os.mkdir(w_lock)
OSError: [Errno 2] No such file or directory: '/var/cache/salt/master/file_lists/roots/.foo/bar.w'
 2019-01-17 17:03:33 +01:00
Daniel Wozniak
094bd33279
Merge pull request #51184 from twangboy/fix_auditpol 
Fix win_lgpo_auditpol salt util on Windows
 2019-01-16 11:08:00 -07:00
twangboy
7300d84d54
Skip debian tests on Windows 2019-01-16 09:31:37 -05:00
twangboy
4622433f84
Fix test_debian_ip on Windows 2019-01-16 09:31:33 -05:00
twangboy
2e68d35678
directly call cmd.run_all 
Apparently, you can't always use __salt__ in a util
 2019-01-15 18:09:36 -07:00
Daniel Wozniak
563d4875b8
Merge pull request #51010 from amendlik/ldap-groups 
Allow unauthenticated bind for listing LDAP groups
 2019-01-15 09:43:41 -07:00
Daniel Wozniak
b19c990a16
Merge pull request #51097 from terminalmage/fix-keyerror-raise 
Fix improper exception raises (2018.3)
 2019-01-15 09:38:24 -07:00
Daniel Wozniak
58eede65a7
Merge pull request #51173 from dwoz/issue51160 
Avoid exceptions by passing bytes to idna
 2019-01-15 09:32:30 -07:00
Pedro Algarvio
b348ace640 Make sure blackout tests clean up after themselves. Properly. 
(cherry picked from commit 9ab0e98e2c)
 2019-01-15 16:31:35 +00:00
Pedro Algarvio
68a12d50d0 These should not be considered destructive tests 
(cherry picked from commit 479439ab99)
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
71c357414d Revert "backport test improvements from develop" 
This reverts commit 0af7653dfa3fc9b30601dec2c8ac2ce3cba52e7f.

I guess that was way too optimistic.
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
e32d219599 backport test improvements from develop 
Bogus random test failures
forklifted from develop at 414bfe61a4
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
0a92c4691d Need more detail on test failure 2019-01-15 16:31:35 +00:00
Jeremy McMillan
c92a24752c don't try to handle/log test exception 2019-01-15 16:31:35 +00:00
Jeremy McMillan
eb605867c6 remove bad extra test assertion inside exception handler 2019-01-15 16:31:35 +00:00
Jeremy McMillan
f9594b8a1f don't test invalid combination 2019-01-15 16:31:35 +00:00
Jeremy McMillan
de823fd3ae fix good_host_ports iteration 2019-01-15 16:31:35 +00:00
Jeremy McMillan
c5a5b34fc4 test assertion correction 2019-01-15 16:31:35 +00:00
Jeremy McMillan
d28bab6fd0 fix test setup 2019-01-15 16:31:35 +00:00
Jeremy McMillan
571603c4ce coverage for master host:port ipv4 and ipv6 config value support 
fix test_parse_host_port bad values
lint
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
f14ff16626 fix minion zmq connecting to master configured as IPv6 address 2019-01-15 16:31:35 +00:00
Jeremy McMillan
194a024ed0 coverage for master host:port ipv4 and ipv6 config value support 
fix test_parse_host_port bad values
lint
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
df7338809b fix minion zmq connecting to master configured as IPv6 address 2019-01-15 16:31:35 +00:00
Erik Johnson
a3c0b49b64
Fix poorly-written test 
This test was confirming the incorrect prior behavior.
 2019-01-15 05:56:40 -06:00
Daniel A. Wozniak
11cc7b33d4
Remove un-needed test 2019-01-14 20:00:09 -07:00
Daniel A. Wozniak
0f87812aff
Merge develop, Revert exception handling 2019-01-14 19:50:16 -07:00
Daniel A. Wozniak
7365a1a8ec
Pass bytes to idna 2019-01-14 19:10:23 -07:00
Gareth J. Greenaway
d39d8b720d
Merge branch '2018.3' into merge-2018.3 2019-01-14 14:48:44 -08:00
Ch3LL
74edfd97f3
Fix pylint 2019-01-14 15:09:27 -05:00
Adam Mendlik
1a4e307c0d
Ignore exceptions when generating the minion ID 
Fixes #51160
 2019-01-13 20:44:11 -07:00