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,951 Commits 24 Branches 182 Tags 341 MiB
4e855050e8
Commit Graph

95951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6f2c7cf9e9
Remoe un-needed log statement 2019-01-25 14:42:44 -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
Daniel A. Wozniak
c893dc445a
Fix saltmod roster test 2019-01-25 14:32:58 -05:00
Daniel A. Wozniak
b61854f594
Roster defines the roster system not a file 2019-01-25 14:32:52 -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
e90ca1d63c
Merge pull request #51290 from s0undt3ch/hotfix/fix-network 
[2018.3.4] Fix minion start
 2019-01-25 15:14:46 +00:00
Pedro Algarvio
da3aace317
Merge branch '2018.3.4' into hotfix/fix-network 2019-01-25 15:14:24 +00:00
Pedro Algarvio
c8db7e3751
Merge pull request #51317 from terminalmage/fix-pr-50417 
Fix regression in dynamic pillarenv
 2019-01-25 09:29:44 +00:00
Pedro Algarvio
4be2891855
Merge branch '2018.3.4' into fix-pr-50417 2019-01-25 09:29:31 +00:00
Thomas S Hatch
e246fdb6d3
Merge pull request #51311 from twangboy/fix_test_file.test_managed 
Fix failing test `unit.states.test_file.TestFileState.test_managed` on Windows
 2019-01-24 14:09:35 -07:00
Erik Johnson
4c4ded3632
Fix regression in dynamic pillarenv 
https://github.com/saltstack/salt/pull/50417 caused a regression in
which the env name is not properly detected as `base` when
`get_checkout_target()` returns the branch name corresponding to that
repo's `base` config option. This corrects that regression.
 2019-01-24 14:35:11 -06:00
twangboy
f4177e0adb
Remove mode parameter on Windows 2019-01-24 10:11:48 -07:00
Pedro Algarvio
40b20126d6
Merge pull request #51292 from Ch3LL/bp-51226 
Backport #51226 into 2018.3.45
 2019-01-24 11:11:33 +00:00
Pedro Algarvio
aba114ea13
Merge branch '2018.3.4' into bp-51226 2019-01-24 11:11:05 +00:00
Pedro Algarvio
fc0bec50d4
Merge pull request #51295 from Ch3LL/bp-51279 
Backport #51279 into 2018.3.4
 2019-01-24 11:10:18 +00:00
Pedro Algarvio
5c4a7a42f2
Merge branch '2018.3.4' into bp-51279 2019-01-24 11:10:00 +00:00
Pedro Algarvio
dacd1ea5f2
Merge pull request #51293 from Ch3LL/bp-51233-2 
Backport #51233 into 2018.3.4
 2019-01-24 09:17:49 +00:00
twangboy
d2eba77bf7
Remove network.py patch 
This is fixed via another PR (#51274)
 2019-01-23 14:11:40 -05:00
twangboy
d431c713c7
Add __context__ support 
Fix issue with case sensitivity
 2019-01-23 14:11:39 -05:00
Gareth J. Greenaway
a155fd7650
Accounting for when permissions are not returned from file.check_perms, eg. windows systems. 2019-01-23 14:06:37 -05:00
Gareth J. Greenaway
53ba0689a8
When test=True and there are permissions changes, report it. 2019-01-23 14:06:31 -05:00
Gareth J. Greenaway
de6c13d5a4
Handle spaces in fstab opts, similar fix to #39593 2019-01-23 14:03:39 -05:00
Pedro Algarvio
04f16b8c91
Fix tests. We no longer get ipaddress instances back. 2019-01-23 18:07:25 +00:00
twangboy
c3fa82a927
Fix minion start issue 2019-01-23 18:07:22 +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
Gareth J. Greenaway
e53e9b16b3
Merge pull request #51230 from Ch3LL/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-01-18 11:50:09 -08:00
Ch3LL
0ef76755db
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/capirca_acl.py
 2019-01-17 16:11:12 -05:00
Daniel Wozniak
26008ef26c
Merge pull request #51212 from sathieu/file_roots_slash 
Allow slashes in file_roots envs.
 2019-01-17 10:29:17 -07:00
Mathieu Parent
b769f18085
Allow slash in file_roots envs 
Fixes: #51211
 2019-01-17 17:03:38 +01: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
Shane Lee
5916282144
Merge pull request #51209 from garethgreenaway/bp-51124 
[2018.3] Back-port PR #51124 to 2018.3
 2019-01-17 06:28:31 -07:00
Ch3LL
82acce47cd
Handle encoding when opening file for both py2/py3 
Conflicts:
	setup.py
 2019-01-16 19:09:25 -08: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
Daniel Wozniak
ac719226c0
Merge pull request #51191 from Ch3LL/bp-50918 
Backport #50918 into 2018.3
 2019-01-16 11:02:18 -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
e7f53a3df0
Merge pull request #51144 from jgleissner/2018.3-azurearm-py3 
2018.3 azurearm py3
 2019-01-15 09:46:34 -07:00
Daniel Wozniak
1206f92357
Merge pull request #51171 from twangboy/fix_crypt 
Add random sleep time to avoid overloading Windows
 2019-01-15 09:45:32 -07:00
Daniel Wozniak
a96deed641
Merge pull request #51174 from jpsv/2018.3 
Update OpsGenie to use their V2 API (2018.3)
 2019-01-15 09:44:53 -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
6dc375226d
Merge pull request #51112 from s0undt3ch/2018.3 
[2018.3] Update to salt-bootstrap v2019.01.08
 2019-01-15 09:42:08 -07:00