valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,308 Commits 24 Branches 182 Tags 341 MiB
8e3e897ee2
Commit Graph

83308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Bradfield
1dcf167bb7 Update state.py 
create `_clean_tag()` method to safely encode tag names for file creation
use `_clean_tag()` method  for both create and read of state cache file
 2017-08-23 14:17:54 -04:00
Mike Place
44b3caead1 Merge pull request #43056 from damon-atkins/2017.7 
safe_filename_leaf(file_basename) and safe_filepath(file_path_name)
 2017-08-23 11:35:01 -06:00
Mike Place
669b376abf Merge pull request #43151 from ushmodin/2016.11 
state.sls hangs on file.recurse with clean: True on windows
 2017-08-23 11:25:32 -06:00
Erik Johnson
d5b2a0be68 Resolve image ID during container comparison 
This fixes an issue where inspecting the container returns an image ID
instead of an image name, resulting in a spurious report of a changed
image. By resolving the image down to its ID for both the existing and
new containers, we ensure we're comparing ID to ID.
 2017-08-23 12:23:33 -05:00
Mike Place
6ca9131a23 Merge pull request #43146 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-23 10:56:09 -06:00
lomeroe
af181b3257 correct fopen calls from salt.utils for 2017.7 2017-08-23 11:11:08 -05:00
lomeroe
acc3d7ac82 correct fopen calls from salt.utils for 2016.11's utils function 2017-08-23 11:09:12 -05:00
lomeroe
2da1cdd109 lint fix 2017-08-23 11:02:53 -05:00
lomeroe
61bd12c0de track xml namespace to ensure policies w/duplicate IDs or Names do not 
conflict
 2017-08-23 11:02:53 -05:00
Mike Place
03f652159f Merge pull request #43123 from twangboy/win_fix_test_which 
Fix `unit.utils.test_which` for Windows
 2017-08-23 10:01:38 -06:00
Mike Place
5a4fc07863 Merge pull request #43142 from rallytime/bp-43068 
Back-port #43068 to 2017.7
 2017-08-23 09:56:47 -06:00
lomeroe
f232bed9f9 add additional checks for ADM policies that have the same ADMX policy ID 
(#42279)
 2017-08-23 10:56:20 -05:00
Ushmodin Nikolay
c5841e2ade state.sls hangs on file.recurse with clean: True on windows 2017-08-23 22:43:04 +07:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Nicole Thomas
0467a0e3bf Merge pull request #43038 from twangboy/win_unit_utils_test_url 
Fix `unit.utils.test_url` for Windows
 2017-08-23 09:35:24 -04:00
Andreas Thienemann
efc1c8c506 Mark selinux._filetype_id_to_string as public function 
_filetype_id_to_string is a private function in the selinux
module.
The selinux state module calls the function as filetype_id_to_string
which fails of course.

Rename the function from the private one to a public one to make
the state call work.

Resolves #42505.
 2017-08-23 09:29:29 -04:00
Nicole Thomas
e9ccaa61d2 Merge pull request #43097 from twangboy/win_fix_group 
Fix `group.present` for Windows
 2017-08-23 09:19:55 -04:00
Mapel88
290d7b54af Fix plint errors 
Fix plint errors
 2017-08-23 10:05:17 +03:00
Mapel88
f4f32421ab Fix plint errors 
Fix plint errors
 2017-08-23 10:03:44 +03:00
twangboy
ed97cff5f6 Fix unit.utils.test_which for Windows 
This test wasn't really written with Windows in mind. Uses PATHEXT that
actually resembles a Windows environment. The test value has the correct
path seperator for Windows.
 2017-08-22 16:59:22 -06:00
lomeroe
f74480f11e lint fix 2017-08-22 17:31:54 -05:00
lomeroe
ecd446fd55 track xml namespace to ensure policies w/duplicate IDs or Names do not 
conflict
 2017-08-22 17:31:54 -05:00
lomeroe
9f3047c420 add additional checks for ADM policies that have the same ADMX policy ID 
(#42279)
 2017-08-22 17:31:54 -05:00
Mike Place
8140855627 Merge pull request #43115 from rallytime/bp-42067 
Back-port #42067 to 2017.7
 2017-08-22 14:09:52 -06:00
Mike Place
1e1a81036c Merge pull request #42962 from twangboy/win_unit_test_doc 
Fix `unit.test_doc test` for Windows
 2017-08-22 12:06:22 -06:00
Vitaliy Fuks
8a6ad0a9cf Fixed typo. 2017-08-22 13:10:25 -04:00
Vitaliy Fuks
9a5ae2bba1 Removed several uses of name.split('.')[0] in SoftLayer driver. 
This code is breaking when server names with multiple periods are used - for
example, name=server1.prod.dc1 domain=example.com. Simply "split and use first
one isn't the reverse operation of "'.'.join([name, domain])" which is done
when VM is created here: 9dcd11c155 (diff-ac8112a3f8d2ebde0edf104797fe64d7)

We've been running with these changes for a while and don't have any issues
creating or destroying instances.

The caveat that some operations (such as destroying) through SoftLayer API
require hostname (without domain) is already documented in Salt and still
applies.
 2017-08-22 13:10:17 -04:00
twangboy
43b0360763 Fix lint 2017-08-22 10:54:01 -06:00
Mike Place
ae9d2b7985 Merge pull request #42986 from renner/systemd-notify 
Notify systemd synchronously (via NOTIFY_SOCKET)
 2017-08-22 10:52:56 -06:00
Mike Place
d347d1cf8f Merge pull request #42995 from twangboy/win_fix_invalid_requisite 
Fix malformed requisite for Windows
 2017-08-22 10:50:00 -06:00
Mike Place
1c7992a832 Merge pull request #43108 from rallytime/bp-42988 
Back-port #42988 to 2017.7
 2017-08-22 10:49:26 -06:00
Mike Place
b420fbe618 Merge pull request #43037 from mcarlton00/fix-bhyve-grains 
Issue #43036 Bhyve virtual grain in Linux VMs
 2017-08-22 10:43:40 -06:00
Nicole Thomas
c6993f4a84 Merge pull request #43107 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-22 12:11:25 -04:00
Mike Place
0a86f2d884 Merge pull request #43100 from vutny/doc-add-missing-utils-ext 
[DOCS] Add missing `utils` sub-dir listed for `extension_modules`
 2017-08-22 09:40:08 -06:00
Mapel88
ec20e9a19a Fix bug #43110 - win_iis module 
Fix func create_cert_binding.
win 2008 uses the following format: ip!port and not ip!port!
 2017-08-22 17:52:20 +03:00
Mapel88
009ef6686b Fix dictionary keys from string to int 
identity type values are int.
 2017-08-22 17:27:55 +03:00
Johannes Renner
79c53f3f81 Fallback to systemd_notify_call() in case of socket.error 2017-08-22 15:57:51 +02:00
Tarjei Husøy
1a987cb948 Fix broken negation in iptables 
Introduced in 7c6ff77c and released with 2017.7.
 2017-08-22 09:43:20 -04:00
rallytime
328dd6aa23 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/osx/pkg-scripts/postinstall
  - pkg/osx/pkg-scripts/preinstall
 2017-08-22 09:38:33 -04:00
Johannes Renner
f1765472dd Notify systemd synchronously (via NOTIFY_SOCKET) 
Forking the systemd-notify command is known to be unreliable at least
with older versions of the kernel and/or systemd. When systemd receives
the notification the systemd-notify process may have already exited
causing an error in the logs while waiting for a (90 seconds) timeout.

This patch instead notifies the systemd NOTIFY_SOCKET synchronously in
case the systemd.daemon python library is not available.
 2017-08-22 13:42:01 +02:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
twangboy
9ffe315d7d Add kwargs 2017-08-21 18:45:11 -06:00
twangboy
4f4e34c79f Fix group state for Windows 
group no longer fails when domain is not specified
group.present now accepts group names without domains
local groups are assumed if domain is not specified
documentation improved
moved fix_local_user function to salt.utils.win_functions
now called get_sam_name
 2017-08-21 18:39:09 -06:00
Mike Place
e2bf2f448e Merge pull request #42985 from DSRCorporation/bugs/15171_recursion_limit 
Properly handle `prereq` having lost requisites.
 2017-08-21 16:49:38 -06:00
Mike Place
f9b4976c02 Merge pull request #42996 from twangboy/win_fix_test_stateconf 
Fix `unit.test_stateconf` for Windows
 2017-08-21 16:43:58 -06:00
Mike Place
19fc644c9b Merge pull request #43024 from twangboy/win_unit_utils_test_find 
Fix `unit.utils.test_find` for Windows
 2017-08-21 16:38:09 -06:00
twangboy
93390de88b Fix malformed requisite for Windows 2017-08-21 16:27:50 -06:00
Mike Place
1a531169fc Merge pull request #43088 from gtmanfred/2017.7 
allow docker util to be reloaded with reload_modules
 2017-08-21 16:14:36 -06:00
Mike Place
83e528f0b3 Merge pull request #43091 from mitodl/2017.7 
Fixed issue with silently passing all tests in Testinfra module
 2017-08-21 16:06:21 -06:00
Mike Place
5482524270 Merge pull request #41994 from twangboy/win_unit_test_cmdmod 
Fix `unit.modules.test_cmdmod` on Windows
 2017-08-21 15:53:01 -06:00