Commit Graph

61606 Commits

Author SHA1 Message Date
Shammah Chancellor
baa4df25c9 Make example top file match templated version
Currently the example top file under "Matching Grains in the Top File" has
node_type grains whose values do not match the names of the states which
they specify.  (e.g. the `webserver` node_type specifies the `web` state).  
Later these values are templated using jinja templates as if they are identical.

This commit adjusts the values in the example to be identical, so that the 
template example follows naturally.
2016-04-22 13:32:56 -06:00
Erik Johnson
cda00f4f93 Improve documentation on pygit2 versions (#32779)
This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.
2016-04-22 12:47:57 -06:00
Dmitry Kuzmenko
1d6d234417 Properly handle minion failback failure. (#32749)
* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test
2016-04-22 09:15:55 -06:00
Denys Havrysh
3751a270d7 Document pillar cache options (#32643)
* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job
2016-04-22 08:54:30 -06:00
Justin Findlay
35c8af3ece modules.win_dacl: consistent case of dacl constants (#32720) 2016-04-21 08:39:23 -06:00
Boris Feld
2cd08177be Update external auth documentation to list supported matcher. (#32733)
Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.
2016-04-21 08:33:50 -06:00
Joseph Hall
bba089d716 Check dependencies type before appling str operations (#32693) 2016-04-20 13:59:15 -06:00
garethgreenaway
3aa0605033 Handle when beacon not configured and we try to enable/disable them (#32692)
* Handle the situation when the beacon is not configured and we try to disable it

* a couple more missing returns in the enable & disable
2016-04-20 13:58:51 -06:00
Nicole Thomas
f52af5a596 Merge pull request #32718 from garethgreenaway/2015_8_schedule_list_fix
Fixes to schedule.list in 2015.8
2016-04-20 13:51:24 -06:00
Gareth J. Greenaway
7fa5d809d2 backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule 2016-04-20 09:05:50 -07:00
Nicole Thomas
f63566e452 Merge pull request #32684 from captaininspiration/2015.8
Fix routes for redhat < 6
2016-04-19 13:18:19 -06:00
Joseph Hall
7cdd5121ef Handle a couple of arguments better (Azure) (#32683) 2016-04-19 10:29:43 -06:00
captaininspiration
640c7a90da Fix routes for redhat < 6 2016-04-19 18:06:11 +02:00
Ryan Larson
aaa03bc6e6 Fix for issue 32523 (#32672) 2016-04-19 07:05:19 -06:00
Dmitry Kuzmenko
21081b1e88 Don't access deprecated Exception.message attribute. (#32556)
* Don't access deprecated Exception.message attribute.

To avoid a deprecation warning message in logs.
There is a new function salt.exceptions.get_error_message(e) instead.

* Fixed module docs test.
2016-04-18 10:51:43 -06:00
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
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
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
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