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
67,335 Commits 24 Branches 182 Tags 341 MiB
b92e19472f
Commit Graph

67335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
b92e19472f Fix comment about minion_id_caching (#32838) 2016-04-25 14:56:40 -06:00
Justin Findlay
1bce58eb73 update bootstrap to 2016.04.18 release (#32669) 2016-04-25 13:55:15 -06:00
Alejandro Bednarik
22e662f024 Small fixes for pip and virtualenv modules. (#32637) 
Replaced a stack error with a well formatted message when virtualenv
binary is not present.
Also in pip module the was a mix of references to the logging object.
Changed all to logger since long is a variable that refers to pip log.

dummy
 2016-04-25 11:45:29 -06:00
Shane Lee
25df973d4c Added pycurl to windows dependencies (#32731) 2016-04-25 11:13:10 -06:00
Shane Lee
8de1c6c094 Add debugging options to mac service configs (#32789) 2016-04-25 11:06:30 -06:00
Shane Lee
c657f3d829 Remove additional unneeded files and dirs (#32790) 2016-04-25 09:23:47 -06:00
Alejandro Bednarik
66ba35261c Archive extracted perms update. (#32765) 
As described in #32753 archived.extracted chnages more permissions that they
should. Since if_missing is None, name is assigned to this variable, this
chnage will help not updating files/dirs permissions outside the actual extracted file.
 2016-04-22 09:17:11 -06:00
Daniel Wallace
ef5305a23b Allow for specifying not using the random module (#32763) 
The Random module can lead to non alpha numeric characters in the
password.  Since we also use this for creating the salt, some devices
cannot have these extra characters in their salts, so allow to turn this
feature off as needed.
 2016-04-22 09:05:53 -06:00
Jorge Schrauwen
ed89a6cb0c fixes issue #32748 (#32770) 2016-04-22 08:38:56 -06:00
Shane Lee
13f18beefc Add license information for pip modules (#32738) 
* Adds readme file for license information

* Add special requirements modules
 2016-04-21 08:12:04 -06:00
Nicole Thomas
1100104c2c Merge pull request #32721 from alprs/docs-orch_arg_examples 
Orchestration docs: show the use of "name" and "kwarg" in examples
 2016-04-20 13:44:58 -06:00
Andreas Lutro
e8625c9be4 show the use of "name" and "kwarg" in examples 2016-04-20 19:23:40 +02:00
Nicole Thomas
62c9e9cca0 Merge pull request #32673 from tonybaloney/2016.3 
Added some unit tests for GCE and Dimension Data modules
 2016-04-19 13:22:19 -06:00
Anthony Shaw
1183106e75 Fix line endings 2016-04-20 01:32:49 +10:00
Anthony Shaw
d2abe56a20 Added some unit tests for GCE and Dimension Data modules 2016-04-19 08:18:25 +10:00
Mike Place
fa8e39bde0 Fix pillar.get (#32663) 
Partial backport of #31319
 2016-04-18 15:48:45 -06:00
Nicole Thomas
d719765a10 Merge pull request #32664 from tonybaloney/2016.3 
Fix missing global redirect declaration statements in Dimension Data module
 2016-04-18 15:17:16 -06:00
Anthony Shaw
0c9669048d Fix missing global redirect declaration statements 2016-04-19 06:14:06 +10:00
Justin Anderson
f6861768f4 Skipping boto test on OpenSuse (#32624) 2016-04-18 09:57:51 -06:00
Knut Auvor Grythe
d432e4b990 Add support for unicode in all GECOS fields (#32630) 
* Add support for unicode in all GECOS fields

* Stop exposing sdecode from salt.modules.useradd

* Slight rephrase of comment

* Fix lint errors
 2016-04-18 08:56:40 -06:00
Nitin Madhok
bc2cabb924 Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32641) 2016-04-18 08:47:54 -06:00
Erik Johnson
aade963c55 Prevent traceback when deprecation warnings reference Oxygen (#32634) 
If a warn_until references Oxygen, a traceback will result since this
was still commented out in version.py. With a recent PR being merged we
now have deprecation warnings referencing this version, so this version
must be uncommented in version.py.
 2016-04-16 12:38:18 -06:00
Erik Johnson
aa9c458346 Add json5 renderer (#32635) 
* Add JSON5 renderer

* Add documentation RST files for json5 renderer
 2016-04-16 12:37:42 -06:00
Shane Lee
97111bdc9b Fix mac_service and mac_system modules (#32587) 
* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
 2016-04-15 15:49:44 -06:00
Nicole Thomas
0f90be45bc Merge pull request #32618 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-15 15:25:40 -06:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
  - salt/states/user.py
 2016-04-15 13:58:50 -06:00
Ronald van Zantvoort
c25dffe7a9 Deprecate 'user' and 'group' in state cmd (#32613) 
* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release
 2016-04-15 13:30:56 -06:00
Nicole Thomas
05a41a13cd Merge pull request #32614 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-15 13:27:47 -06:00
Nicole Thomas
ef17bde054 Merge pull request #32616 from rallytime/bp-32547 
Back-port #32547 to 2015.8
 2016-04-15 13:27:36 -06:00
Andreas Lutro
68a3c95235 Fix some mistakes in the salt-ssh thin shell script (#32583) 
* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it
 2016-04-15 12:37:02 -06:00
C. R. Oldham
4242bc7399 Language clarification. 2016-04-15 12:20:56 -06:00
C. R. Oldham
965e3bc1d1 Expand on the open-source vs open-core FAQ 2016-04-15 12:20:56 -06:00
rallytime
046e401dd8 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-04-15 12:11:59 -06:00
Daniel Wallace
0b370d67b4 alphabetize directories for dynamic modules (#32599) 
Also add engines and proxy minions to the list.
 2016-04-15 08:58:19 -06:00
Vincas Dargis
30474713ac Fix comments value in salt.states.pkgrepo example (#32604) 
'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.
 2016-04-15 08:41:41 -06:00
Erik Johnson
ab9da90ced Revert PR #32480 and apply #32314 with fixes / documentation (#32558) 
* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock
 2016-04-14 10:36:59 -06:00
Dmitry Kuzmenko
c84c9218fd Better log message on minion restart if master couldn't be reached. (#32576) 2016-04-14 10:35:59 -06:00
Nicole Thomas
027b502335 Merge pull request #32561 from gtmanfred/user_passwords 
redact passwords and hashes from user.present updates
 2016-04-14 09:48:59 -06:00
Daniel Wallace
3db5e78d5d redact passwords and hashes from user.present updates 
Fixes #32381
 2016-04-13 17:43:35 -05:00
Daniel Wallace
6c3d7aa293 use defaults if opts doesn't have the keys either (#32550) 
Fixes #32456
 2016-04-13 15:08:58 -06:00
Dmitry Kuzmenko
3c81798b6f Don't return None from eval_master (#32555) 
Raise an exception instead. Because eval master if returns should return
a tuple.
 2016-04-13 15:08:37 -06:00
Nicole Thomas
7647f2f4f2 Merge pull request #32543 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-13 14:06:32 -06:00
Nicole Thomas
27e91e40cc Merge pull request #32536 from rallytime/bp-31898 
Back-port #31898 to 2015.8
 2016-04-13 12:49:05 -06:00
Shane Lee
d12a1c2b8d Fix binary search and replace (#32542) 2016-04-13 10:15:02 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
 2016-04-13 09:42:54 -06:00
Nicole Thomas
cce7de76b0 Merge pull request #32539 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-13 09:10:08 -06:00
rallytime
fbaeb165c9 Merge branch '2015.5' into merge-2015.8 
No conflicts.
 2016-04-13 09:07:39 -06:00
Nicole Thomas
7307bcb88e Merge pull request #32538 from rallytime/bp-32528 
Back-port #32528 to 2015.5
 2016-04-13 09:06:14 -06:00
rallytime
46a4e8a310 Remove merge conflict line 2016-04-13 09:05:31 -06:00
Andrew Pashkin
e0d947c707 Document "grains" setting in the minion configuration reference 2016-04-13 08:56:05 -06:00