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
61,844 Commits 24 Branches 182 Tags 341 MiB
3989e5b3de
Commit Graph

61844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
5d1e9a478b Lower log level for pillar cache (#32655) 
This shouldn't show up on salt-call runs
 2016-04-18 10:32:44 -06:00
Thomas S Hatch
a6a427463d Merge pull request #32588 from alprs/fix-salt_ssh_module_types 
Fix salt-ssh module function call argument type juggling by JSON encoding them
 2016-04-18 09:57:14 -06:00
Erik Johnson
5e7edfccfa yumpkg: Ignore epoch in version comparison for explict versions without an epoch (#32563) 
* yumpkg: Ignore epoch in version comparison for explict versions without an epoch

Also properly handle comparisions for packages with multiple versions.

Resolves #32229

* Don't attempt downgrade for kernel and its subpackages

Multiple versions are supported since their paths do not conflict.
 2016-04-18 09:03:06 -06:00
Nitin Madhok
c910b8dd51 Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32639) 2016-04-18 08:48:19 -06:00
Nitin Madhok
fea6056ded Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32640) 2016-04-18 08:48:07 -06:00
Nitin Madhok
4568565d45 Add _syspaths.py to .gitignore (#32638) 2016-04-18 08:40:54 -06:00
Michael Calmer
0477f6613f align OS grains from older SLES with current one (#32649) 2016-04-18 08:31:58 -06:00
Bo Maryniuk
8d46244d59 Prevent crash if pygit2 package is requesting re-compilation of the e… (#32652) 
* Prevent crash if pygit2 package is requesting re-compilation of the entire library on production systems (no *devel packages)

* Fix PEP8: move imports to the top of the file

* Move logger up

* Add log error message in case if exception is not an ImportError
 2016-04-18 08:25:05 -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
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
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
Andreas Lutro
d912f1c3c6 json encode arguments passed to an execution module function call 
this fixes problems where you could pass a string to a module function,
which thanks to the yaml decoder which is used when parsing command line
arguments could change its type entirely. for example:

__salt__['test.echo')('{foo: bar}')

the test.echo function just returns the argument it's given. however,
because it's being called through a salt-call process like this:

salt-call --local test.echo {foo: bar}

salt thinks it's yaml and therefore yaml decodes it. the return value
from the test.echo call above is therefore a dict, not a string.
 2016-04-14 19:38:04 +02: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
Mike Place
b19c5a5ce7 Verify auth in saltnado run (#32552) 
Refs #32451
 2016-04-14 10:16:48 -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
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
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
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
Nicole Thomas
1834bdefe3 Merge pull request #32531 from ticosax/support-no-volumes 
[dockerng] Fix support of dockerng.volume_present when no volume is on present.
 2016-04-13 08:42:12 -06:00
afletch
60d80c4dee Ensure rh_service not used on CloudLinux 7 
Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7
 2016-04-13 08:38:10 -06:00
Nicolas Delaby
5d73d54ed2 Enhance dockerng.wait() to control success on exit_code and on already stopped containers (#32475) 2016-04-13 08:16:26 -06:00
Bo Maryniuk
214f01e963 Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access (#32436) 
* Raise an exception if keys are tried to be written to the directory that has no write access permissions

* Show an reasonable error message instead of a traceback crash.

* Fix the unit tests
 2016-04-13 08:15:37 -06:00
Erik Johnson
288839f4b6 Turn on exc_info when logging failed minion startup (#32515) 2016-04-13 08:13:53 -06:00
Erik Johnson
08a80207e6 Add ignore_epoch option to pkg.installed/removed/purged states (#32520) 
This allows for the epoch to be disregarded when a version is specified.
 2016-04-13 08:11:33 -06:00
Nicolas Delaby
958b2ec749 Fix support of dockerng.volume_present when no volume is on present. 
fixes #32493
 2016-04-13 15:47:13 +02:00
Bo Maryniuk
492ebfc184 Isbm zypper list products sles11 crash (#32505) 
* Check for EOL aggregate and fix time_t attribute

* Update SLE11 SP3 data

* Update SLE12 SP1 data

* Adjust test values according to the testing data
 2016-04-12 08:14:19 -06:00
Erik Johnson
ae89882fed Clear VCS fsbackend and git_pillar locks on master start (#32480) 
* Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks

* Clear VCS fsbackend and git_pillar locks on master start

* Fix loop in maint.flo
 2016-04-11 16:56:08 -06:00
Shane Lee
a6482a3171 Use win32api to get Total System Memory (#32491) 
Fixes: #32327
 2016-04-11 16:32:52 -06:00
Nicole Thomas
e335e313fe Merge pull request #32487 from terminalmage/epoch-documentation 
Add explanation of nonzero epoch requirement to pkg.installed state documentation
 2016-04-11 14:48:57 -06:00
Nicole Thomas
e8de50ff37 Merge pull request #32482 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-11 14:12:26 -06:00
Erik Johnson
e04cf879b6 Document new behavior of pkg.installed for yum/dnf packages with non-zero epoch 2016-04-11 14:42:23 -05:00
Erik Johnson
61e9761224 Add explanation of nonzero epoch requirement to pkg.installed state documentation 
Resolves #31927.
 2016-04-11 14:35:27 -05:00
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
 2016-04-11 11:33:08 -06:00
Nicole Thomas
29333e533e Add documentation for some master/minion configs (#32454) 
Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
 2016-04-11 10:49:52 -06:00
Dmitry Kuzmenko
f5bd6bdcc3 Backport 31164 and 31364 (#32474) 
* Don't send REQ while another one is waiting for response.

The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.

* Fixed zeromq ReqMessageClient destroy
 2016-04-11 08:02:36 -06:00
Nicole Thomas
100c6e1b25 Merge pull request #32458 from terminalmage/clarify-providers-docs 
Improve and clarify docs on provider overrides.
 2016-04-09 08:25:42 -06:00
Erik Johnson
500d3ebbaa Add link to provider override docs to all group providers 2016-04-08 23:36:02 -05:00
Erik Johnson
83ca01f620 dd link to provider override docs to all shadow providers 2016-04-08 23:34:31 -05:00
Erik Johnson
c5fe38789d Add link to provider override docs to all user providers 2016-04-08 23:32:41 -05:00
Erik Johnson
5c1c1dda59 Add link to provider override docs to all service providers 2016-04-08 23:04:14 -05:00