valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,455 Commits 24 Branches 182 Tags 341 MiB
ca71d0e7c2
Commit Graph

87455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
2551454f6a Add absolute_import 2017-10-19 18:26:08 -05:00
Mike Place
19a5383c59 Merge pull request #43966 from pratik705/create-route-to-send-traffic-by-natting_for_GCP 
create route to send traffic by natting for_GCP
 2017-10-19 18:01:05 -05:00
Mike Place
9f9e936b52 Merge pull request #43830 from rallytime/bp-43644 
Back-port #43644 to 2016.11
 2017-10-19 17:57:50 -05:00
Eric Radman
6da4fd979b
Check file attributes in check_file_meta() if lsattr(1) is installed 
lsattr/chattr is not installed on many Unix-like platforms by default,
including *BSD, Solaris, and minimal Linux distributions such as Alpine.
 2017-10-19 18:38:12 -04:00
Mike Place
bdfefd1549 Merge branch 'develop' into sentry_mod 2017-10-19 17:33:27 -05:00
Mike Place
07db6a3d8b Merge pull request #43994 from oeuftete/fix-manage-runner-presence 
Fix manage.present to show lost minions
 2017-10-19 17:27:58 -05:00
Mike Place
372820ea38 Merge pull request #44111 from alprs/fix-deb8-py3-oscodename 
Try to correctly parse debian codename from /etc/os-release
 2017-10-19 17:23:25 -05:00
Mike Place
a07537e258 Merge pull request #44188 from terminalmage/issue44150 
yumpkg: Check pkgname instead of name to see if it is a kernel pkg
 2017-10-19 17:20:34 -05:00
Mike Place
1e3abfea59 Merge branch 'develop' into various_beacon_fixes 2017-10-19 15:58:01 -05:00
Mike Place
cc2c99c94c Merge branch 'develop' into fix-inconsistent-exception-handling 2017-10-19 15:53:24 -05:00
Mike Place
68ed8c21b2 Merge branch 'develop' into jinja-test-imports 2017-10-19 15:42:20 -05:00
Mike Place
715edc0cea Merge pull request #44158 from rallytime/bp-44089 
Back-port #44089 to 2016.11
 2017-10-19 15:38:14 -05:00
Mike Place
75136152c1 Merge pull request #44187 from twangboy/win_fix_unit_test_daemons.py 
Fix pickling errors on Windows
 2017-10-19 15:36:50 -05:00
Mike Place
7a89cd8697 Merge pull request #44186 from garethgreenaway/44181_scheduler_multiple_whens 
[2017.7] scheduler fixes
 2017-10-19 15:36:03 -05:00
Mike Place
1d16ae8ba7 Merge pull request #43896 from twangboy/win_fix_lgpo_scom 
Fix win_lgpo execution module
 2017-10-19 15:13:17 -05:00
Mike Place
98356b86af Merge pull request #44080 from twangboy/win_fix_group.present 
Fix a regression in `group.present` in Windows
 2017-10-19 15:10:43 -05:00
Mike Place
5ef124bf2d Merge pull request #44171 from Ch3LL/spm_int 
Add SPM Build Integration Tests
 2017-10-19 14:49:13 -05:00
Mike Place
866a78a673 Merge pull request #44176 from vernondcole/simplify-saltify 
Simplify saltify cloud driver
 2017-10-19 14:37:17 -05:00
twangboy
29bc80ff87
Improve get_sam_name 
Return the actual sam name as reported by LookupAccountName
If the user does not exist, return a fabricated SAM name
Move lower to the state module
 2017-10-19 13:31:59 -06:00
twangboy
ef759a3875
Fix example in function docs for get_sam_name 2017-10-19 13:31:58 -06:00
twangboy
43740c5fed
Document 15 character limit 2017-10-19 13:31:58 -06:00
twangboy
83f36cc2ef
Account for 15 character limit in hostname 2017-10-19 13:31:58 -06:00
twangboy
aa278966de
Remove *args, pass gid as a keyword 2017-10-19 13:31:58 -06:00
twangboy
5230ecd7e1
Accept *args 2017-10-19 13:31:57 -06:00
twangboy
648d1b8d99
Catch CommandExecutionError 2017-10-19 13:31:06 -06:00
twangboy
0040082d0a
Fix pylint error 2017-10-19 13:31:06 -06:00
twangboy
91258cd6a8
Fix typo 2017-10-19 13:31:05 -06:00
twangboy
261dba347d
Put the file.remove in a try/except/else block 2017-10-19 13:31:05 -06:00
twangboy
020c2a2b85
Fix syntax error 2017-10-19 13:31:05 -06:00
twangboy
d5bec99126
Fix some lint 2017-10-19 13:31:05 -06:00
twangboy
b96186d60d
Fix INSTALL_LANGUAGE 
Replace `_` with `-`
Instead of taking the first 2 elements of the language code to find the
abbreviated language code, do a split off the `-` and take the first
element.
 2017-10-19 13:31:04 -06:00
twangboy
5471bd521f
Fix problem with file handle 
Use with io.open so the handle is realeased automatically....
Use `closed` to detect failure to release the file handle and continue
to close until successful
Use `__opts__` to get `cachedir` instead of __salt__
 2017-10-19 13:31:04 -06:00
twangboy
5ec58c6200
Use System Install Language as default fallback 2017-10-19 13:31:04 -06:00
twangboy
f9ad446019
Fix win_lgpo execution module 
The _processPolicyDefinitions fuction loads the adml files for the
corresponding admx. The adml file usually resides in a sub folder in the
C:\Windows\PolicyDefinitions directory that is the language code. The
default is `en-US`.
When the System Center Operations Manager (SCOM) agent is installed, it
adds some addition policy definitions. However, the corresponding adml
files are not in the standard location (`en-US`). Instead they are placed
in the `en` directory.
This PR will cause the win_lgpo module to check in the `en-US` directory
first and then check the `en` directory if still not found.
 2017-10-19 13:31:04 -06:00
twangboy
a862e0bf2d
Remove unneeded import 2017-10-19 13:30:16 -06:00
twangboy
d78f27466d
Fix unit.states.test_mount for Windows 
Use `os.path.realpath` to convert paths
Mock `os.path.exists`
 2017-10-19 13:30:16 -06:00
Erik Johnson
0692f442db yumpkg: Check pkgname instead of name to see if it is a kernel pkg 
We should have been checking pkgname instead of name all along, but this
never bit us until 6638749 started passing `None` for the name param.
 2017-10-19 13:54:03 -05:00
Tom Williams
5c66a38b50 INFRA-5825 - add delete_{ingress,egress}_rules params to boto_secgroup 2017-10-19 13:55:38 -04:00
twangboy
64d2e4f732
Fix pickling errors on Windows 
Moves the 4 sub functions to the global scope
 2017-10-19 11:50:23 -06:00
Nicole Thomas
f0175623ed Merge branch 'develop' into ssh_known_hosts_improvements 2017-10-19 13:44:29 -04:00
Gareth J. Greenaway
7eef3b3571
Adding a copy.deepcopy to the for loop that looks for old jobs to avoid stale jobs ending up in the list. 2017-10-19 10:39:11 -07:00
Nicole Thomas
e322b7c92a Merge branch 'develop' into fix_requests_ssl_verify_error 2017-10-19 13:36:45 -04:00
Sergey Kacheev
56c91f0895 Add requests verify option in vault section 
This fix allow pass requests 'verify' option from vault configs
If vault certificate signed with Intermediate CA,
and Intermedia CA sign by internal root CA,
requests will fail verifying vault certificate with error:

 _ssl.c:510: ... routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed

'verify' option allow explicitly specify ca-bundle, or disable verifications.
http://docs.python-requests.org/en/master/user/advanced/#ssl-cert-verification
 2017-10-20 00:11:29 +07:00
Vernon Cole
4c8cd9c507
lint and comment fixes 2017-10-19 10:16:28 -06:00
Nicole Thomas
05d91f44f4 Whitespace fix 2017-10-19 11:44:17 -04:00
Nicole Thomas
6052bef2f4 Fixup warn_until messages 
This change also updates the `salt.utils.warn_until` path to the new `salt.utils.versions.warn_util` path.
 2017-10-19 10:28:27 -04:00
Nicole Thomas
34a843252d Merge pull request #44157 from benediktwerner/2017.7 
Added 'versionadded' tags to sensehat modules
 2017-10-19 10:13:30 -04:00
Nicole Thomas
1427c72e1e Merge pull request #44164 from terminalmage/fix-docker-docstring 
Fix examples in docker_container.{stopped,absent} docstrings
 2017-10-19 10:12:36 -04:00
Nicole Thomas
77969c4161 Merge pull request #44168 from twangboy/win_skip_pam_eath 
Fix `unit.test_auth` for Windows
 2017-10-19 10:12:21 -04:00
Nicole Thomas
b59cd3698e Merge pull request #44177 from senthilkumar-e/redis_doc_update 
Fixing default redis.host in documentation
 2017-10-19 09:38:30 -04:00