valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,707 Commits 24 Branches 182 Tags 341 MiB
fb89877cf2
Commit Graph

61707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
fb89877cf2 Merge pull request #32892 from isbm/isbm-zypper-env-variables 
Resolve Zypper locks on asynchronous calls
 2016-05-05 07:34:59 -07:00
Ronald van Zantvoort
3e0bf233ee Add fun_args to scheduled return data (part of #24237) (#33039) 
* Add fun_args and fun_kwargs to scheduled return data (part of #24237)

* scheduled return data (part of #24237): Improved fix for fun_args
 2016-05-05 07:15:26 -07:00
Thomas S Hatch
264c0d4c35 Don't append a newline when creating new content with blockreplace (#33049) 
Fix #12422
 2016-05-05 07:11:55 -07:00
Nicole Thomas
54b783a0b0 Pass all data to batch.run() call when using --failhard (#33048) 
Fixes #24996
 2016-05-05 07:11:16 -07:00
Nicole Thomas
2dbfa55f06 Display command output when command fails with batch + failhard options (#33050) 
* Display command output when command fails with batch + failhard options

Fixes #32452

* Use 'res' instead of 'ret' in error message to see minion id
 2016-05-05 07:11:01 -07:00
Nicole Thomas
add9199d34 Allow security_groups kwarg for boto_elb.present to be string or list (#33053) 
Fixes #33041

Also added documentation for examples on how to use it.
 2016-05-05 07:09:22 -07:00
Nicole Thomas
111701c8bb [2015.8] Merge forward from 2015.5 to 2015.8 (#33054) 
* Add run_on_start docs to schedule.rst (#32958)

Fixes #22580

* Backport #33021 manually to 2015.5 (#33044)

* Saltfile with pillar tests (#33045)

* add file.managed with pillar data tests

* do not require git for other tests

* Whitespace...
 2016-05-05 07:05:55 -07:00
Justin Anderson
1066063a19 File and User test fixes for 2015.8 on Fedora23 (#33056) 
* Fix failing user present test

* Fix file_test.test_symlink failure on 2015.8
 2016-05-05 07:05:10 -07:00
Nicole Thomas
f97b5d5531 Back-port #33030 to 2015.8 (#33040) 
* When we restart the minion we should show the error that caused it

* looks better with a newline
 2016-05-04 15:18:43 -07:00
Nicole Thomas
e90a50142a Update the docs for saltutil.find_job to be more clear/accurate (#33017) 
* Update the docs for saltutil.find_job to be more clear/accurate

* Spelling fix
 2016-05-04 09:15:33 -07:00
Nicole Thomas
d3d77cea4a Add saltenv to the cmd.script state function (#33031) 2016-05-04 09:24:44 -06:00
David Boucha
3434f44e3f Fix syndic regression (#33021) 
* fix tag syndic return packing

* check if jid dir exists first
 2016-05-03 13:32:11 -07:00
Shane Lee
4bb3ca5955 Compare uid and gid instead of name and group (#32674) 
* Compare uid and gid instead of name and group

* Gate the uid comparison
 2016-05-03 09:37:52 -07:00
Nicole Thomas
9ca5b02b0c Allow batch mode to use verbose option, as well as show_jid. (#32996) 
Fixes #32856
 2016-05-03 09:17:50 -07:00
Adam Tengler
81c0fa4d78 Fixed glusterfs.peered output (#32955) 
Fixed 'NoneType' object is not iterable and removed existing peers from newpeers list

Fixes #32954
 2016-05-03 08:57:35 -07:00
Nicole Thomas
8c70d7a56b Clarify some arg docs (#32994) 
Fixes #26011

Also reorganizes some of the kwarg definitions so it's more
clear what is documented and what docs are missing.
 2016-05-03 08:54:28 -07:00
Bo Maryniuk
1601a7e07a Prevent the use of "refreshable" together with "nolock" option. 2016-05-03 09:15:00 +02:00
Bo Maryniuk
52e1be2fa9 Remove unused variable in a constructor. Adjust the docstring accordingly. 2016-05-03 09:08:49 +02:00
Bo Maryniuk
7e00f566ef Move log message down to the point where it actually sleeps. Rephrase the message. 2016-05-03 09:05:16 +02:00
Bo Maryniuk
4b7dab83ff Fix PID file path for SLE11 2016-05-03 09:03:07 +02:00
Justin Anderson
00fbeaba5f Fix boto_secgroup_test (#32986) 2016-05-02 10:46:19 -06:00
Jorge Schrauwen
336236750f fix user cron on solarish operating systems (#32970) 
* properly set cron entries on Solarish systems

* also fix write_cron_file(_verbose_

* minor tweak to make merging into 2016.3 and develop easier

* per @damon-atkins, be more restrictive with fpopen for the user crontab

* fix another small security hole by swapping fopen to fpopen + mode. fixed previous commit by switching back to 0600
 2016-05-02 08:28:51 -07:00
Justin Findlay
07e38bc9be salt.log.setup: process user args before format (#32796) 
* salt.log.setup: process user args before format

Before:
    [DEBUG   ] too many %s
After:
    [DEBUG   ] too many secrets

* salt.log.setup: allow SaltLogRecord attrs on console
 2016-04-29 10:47:01 -07:00
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
Nicole Thomas
df41d5dfb1 mode should default to 'text' (#32928) 2016-04-28 14:16:19 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925) 
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
 2016-04-28 14:14:40 -06:00
Nicole Thomas
31b96dec7b Update contents_grains option with relevant docs (#32922) 
Instead of "works like contents_pillar". Also added grains example.

Fixes #23683
 2016-04-28 13:49:07 -06:00
Nicole Thomas
e60c12640d Merge pull request #32926 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-28 13:47:52 -06:00
rallytime
5a184881be Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-04-28 12:33:10 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
Nicole Thomas
85ca86de08 Update docs to warn users that -1 isn't valid for iptables insert state (#32906) 
Fixes #23953

Also clarifies the append state doc to indicate that rules will
always be added to the end of a chain.
 2016-04-28 10:14:28 -06:00
Nicole Thomas
cb68706db2 Allow profile options to be specified in provider file when using maps (#32900) 
Fixes #32510
 2016-04-28 10:07:14 -06:00
Nicole Thomas
1a55fcb733 Clarify service state opening docs - uses 'service' virtualname (#32880) 
* Clarify service state opening docs - uses 'service' virtualname

Fixes #30855

* Add a few more clarifications to service state docs

And link to service execution modules list.
 2016-04-27 14:32:27 -06:00
Nicole Thomas
e1b40b3b76 Merge pull request #32884 from terminalmage/fix-incorrect-deprecation-notice 
Fix incorrect deprecation notice
 2016-04-27 09:47:35 -06:00
Bo Maryniuk
7f37961d4b Rename tags 2016-04-27 15:59:05 +02:00
Bo Maryniuk
c55b0fab58 Test DOM parsing 2016-04-27 15:43:35 +02:00
Bo Maryniuk
c54e928e4f Add exception handling test 2016-04-27 15:43:17 +02:00
Bo Maryniuk
3d245bbe84 Parse DOM out of the box, when XML mode is called 2016-04-27 15:42:50 +02:00
Bo Maryniuk
6a98f523ac Add Zypper caller test suite 2016-04-27 15:21:00 +02:00
Bo Maryniuk
f189f90124 Bugfix: always trigger __getattr__ to reset and increment the configuration before the call. 2016-04-27 15:05:57 +02:00
Bo Maryniuk
7e1712dd80 Fix tests according to the new calling model 2016-04-27 14:35:22 +02:00
Bo Maryniuk
3a30b7fbcd Remove an obsolete test case 2016-04-27 14:34:54 +02:00
Bo Maryniuk
6e5877a2ee Add Zypper Call mock 2016-04-27 14:34:31 +02:00
Bo Maryniuk
bb5540cb4a Bugfix: inverted logic on raising (or not) exceptions 2016-04-27 14:34:17 +02:00
Bo Maryniuk
ce9262fe71 Make Zypper caller module-level reusable 2016-04-27 11:14:31 +02:00
Bo Maryniuk
77dc8695af Update docstrings according to the bugfix 2016-04-27 11:13:43 +02:00
Bo Maryniuk
46d86b21d5 Bugfix: accept refresh override param 2016-04-27 11:13:17 +02:00
Bo Maryniuk
cb40618262 Fire an event about released Zypper with its result 2016-04-27 10:04:32 +02:00
Bo Maryniuk
0728f0bc00 Replace string values with the constants 2016-04-27 10:04:15 +02:00
Erik Johnson
b307c5452a Fix incorrect deprecation notice 
The "deprecated" entry refers to when the deprecation path started, not
when the option will be removed.
 2016-04-26 23:52:08 -05:00