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,934 Commits 24 Branches 182 Tags 341 MiB
3a10b6aef1
Commit Graph

83934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ric Klaren
3a10b6aef1
Fixes #44227, make salt-cloud/libvirt cleanup after errors more robust 
Fix vm cleanup when salt bootstrap fails when using salt-cloud with the libvirt
provider.

Signed-off-by: Ric Klaren <ric@knightswhosay.eu>
 2017-10-23 09:28:35 -05:00
Erik Johnson
01e7bab990 Merge pull request #44008 from mtorromeo/git-noexec-fix 
Backport #43769 to 2017.7
 2017-10-23 09:19:56 -05:00
Erik Johnson
85c0ef493f Merge pull request #44202 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-23 09:18:29 -05:00
Nicole Thomas
d7dc2bd0e8 Merge pull request #44208 from twangboy/win_fix_group.present 
Fix some lint in PR: 44080
 2017-10-20 12:42:01 -04:00
twangboy
61e2e9ccda
Fix some lint 2017-10-20 09:59:54 -06:00
Nicole Thomas
a7a841d9d2 Merge branch '2017.7' into git-noexec-fix 2017-10-20 11:08:20 -04:00
rallytime
99ff7a5c12
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/virtualbox.py
 2017-10-20 10:36:37 -04:00
Nicole Thomas
c6d27ada51 Merge pull request #43843 from twangboy/win_unit_test_mount 
Fix `unit.states.test_mount` for Windows
 2017-10-20 10:27:25 -04:00
Nicole Thomas
09ddfd0c08 Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes 
Fixes to modules/debian_ip
 2017-10-20 10:25:38 -04: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
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
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
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
twangboy
64d2e4f732
Fix pickling errors on Windows 
Moves the 4 sub functions to the global scope
 2017-10-19 11:50:23 -06: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
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
Ch3LL
cd79e9444e
remove unneded kwarg 2017-10-18 17:21:52 -04:00
Ch3LL
1541376c4f
Add spm build test 2017-10-18 17:15:42 -04:00
twangboy
bb1d2eb85b
Skip tests that are failing on PAM eauth 2017-10-18 14:03:10 -06:00
Gareth J. Greenaway
5f7555846f
When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable. 2017-10-18 12:51:29 -07:00
Erik Johnson
7b46489e33 Fix examples in docker_container.{stopped,absent} docstrings 
These were erroneously changed from `dockerng.{stopped,absent}` to
`docker.{stopped,absent}` using sed, when they should have been changed
to reflect the new name of this state module (like the
`docker_container.running` examples were).
 2017-10-18 13:34:11 -05:00
Benedikt Werner
bd825b51cc
Changed sensehat versionadded from 2017.7 to 2017.7.0 2017-10-18 19:08:59 +02:00
Vasili Syrakis
534faf0b7a
Catch on empty Virtualbox network addr #43427 2017-10-18 13:00:25 -04:00