valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,184 Commits 24 Branches 182 Tags 341 MiB
ec377ab379
Commit Graph

76184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
ec377ab379 Reenable skipped RunnerClient tests 
I think these were skipped erroneously or perhaps whatever the problem
was has since been resolved.
 2017-02-24 22:40:59 -07:00
Seth House
27f7fd9ad4 Update _reformat_low to run arg through parse_input 
Also update the function for the current usage and intent which had
gotten muddied a bit over the years.

This also removes a duplicate `{..., 'kwarg': {'kwarg': {...}}}`.

Refs #38962
 2017-02-24 22:40:59 -07:00
Seth House
5177153459 Revert parse_input change from #32005 
We shouldn't run kwargs through the YAML parser. Bit of history behind
this one so gather 'round for story time:

The public-facing RunnerClient methods did not have a way to pass in
positional arguments -- only keyword arguments as top-level values in
the lowdata dict. There has been an effort in recent years to add `arg`
and `kwarg` support to RunnerClient lowdata so it matches the signature
of LocalClient method calls and that effort also allows passing
positional args in the `arg` array. The whole thing is a tad confusing.

tl;dr: The `arg` array should be run through `parse_input()`, everything
else is a `kwarg`.
 2017-02-24 19:29:40 -07:00
Mike Place
fffab54078 Merge pull request #39516 from jettero/give-pillarenv-tops-similar-treatment 
Prevent spurious "Template does not exist" error
 2017-02-24 16:41:35 -07:00
Mike Place
be9629b180 Merge pull request #39654 from skizunov/develop2 
Fix issue where compile_pillar failure causes minion to exit
 2017-02-24 15:47:51 -07:00
Mike Place
e63cbbaab9 Merge pull request #39653 from cachedout/26_odict 
Use salt's ordereddict for comparison
 2017-02-24 15:46:23 -07:00
Sergey Kizunov
9f80bbce07 Fix issue where compile_pillar failure causes minion to exit 
If there is a failure in `Minion._post_master_init` (for example,
the `compile_pillar` fails) and the `master_type` is `failover`,
then `MinionManager._connect_minion` will catch the exception and then
retry. However, the retry will cause the minion to exit because
`opts['master']` is currently a string and not a list. Fix this
case to enable the retry to not cause the minion to exit.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>

Conflicts:
	salt/minion.py
 2017-02-24 15:02:48 -06:00
Mike Place
91eb7210bb
Use salt's ordereddict for comparison 
Last thing needed for 2.6 compat
 2017-02-24 13:44:54 -07:00
Mike Place
0bc6027e68 Merge pull request #39609 from gtmanfred/2016.11 
intialize the Client stuff in FSClient
 2017-02-24 11:50:54 -07:00
Mike Place
28035c07b3 Merge pull request #39615 from skizunov/develop2 
Bonjour/Avahi beacons: Make sure TXT record length is valid
 2017-02-24 11:47:04 -07:00
Nicole Thomas
e9410fb669 Merge pull request #39617 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-24 09:07:54 -07:00
rallytime
13622899d2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2017-02-23 14:37:48 -07:00
Daniel Wallace
0820620ef8 intialize the Client stuff in FSClient 
We need __utils__ in FSClient for s3:// uris.
 2017-02-23 15:20:22 -06:00
Sergey Kizunov
b1c7e9b505 Bonjour/Avahi beacons: Make sure TXT record length is valid 
TXT records are limited in length to 255 characters. Enforce
this requirement.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-02-23 14:58:15 -06:00
Mike Place
0d31201e08 Merge pull request #39505 from cachedout/issue_38758 
Threadsafety option for context dictionaries
 2017-02-23 12:38:12 -07:00
Mike Place
c0d4357f46 Merge pull request #39507 from joe-niland/iis-7-cert-binding 
Detect IIS version and vary certificate association command depending on version
 2017-02-23 12:15:39 -07:00
Nicole Thomas
e6f5e8a474 Merge pull request #39565 from terminalmage/issue39512 
states.file.patch/modules.file.check_hash: use hash length to determine type
 2017-02-23 12:14:27 -07:00
Mike Place
53e22b8f15 Merge pull request #39591 from mcalmer/fix-case-in-os_family 
fix case in os_family for Suse
 2017-02-23 12:07:16 -07:00
Mike Place
aee43f7fa4 Merge pull request #39592 from skazi0/line-user-fix 
Ensure user/group/file_mode after line edit
 2017-02-23 11:40:04 -07:00
Mike Place
6ab4151213 Merge pull request #39596 from ticosax/reduce-scope-catehed-exception 
Reduce scope of try except StopIteration wrapping
 2017-02-23 11:16:17 -07:00
Mike Place
b1c3b84862 Merge pull request #39610 from rallytime/bp-39589 
Back-port #39589 to 2016.11
 2017-02-23 10:48:02 -07:00
Erik Johnson
cbdf905b9f Update test to reflect new state comment 2017-02-23 11:21:33 -06:00
Jarrod Moore
83ec174d44 Set utils property explicitly for FSClient 2017-02-23 10:19:11 -07:00
Jarrod Moore
3889006149 Allow masterless minions to pull files from S3 2017-02-23 10:19:11 -07:00
Nicole Thomas
4e2b852f83 Merge pull request #39600 from vutny/state-file-docs 
state.file: drop non-relevant examples for `source_hash` parameter
 2017-02-23 09:55:26 -07:00
Nicole Thomas
fe15ed9b92 Merge pull request #39606 from rallytime/lint-2016.11 
[2016.11] Pylint: add missing import
 2017-02-23 09:39:54 -07:00
rallytime
71164348e7 [2016.11] Pylint: add missing import 2017-02-23 09:36:14 -07:00
Mike Place
ed83420417 Merge pull request #39584 from cachedout/mentionbot_docs 
A note in the docs about mentionbot
 2017-02-23 08:12:13 -07:00
Denys Havrysh
9b0427c27a state.file: drop non-relevant examples for source_hash parameter 2017-02-23 17:02:09 +02:00
Joe Niland
c94f0b8c62 Fix additional issue whereby existing certificate bindings were not found in IIS 7.5, due to the fact that IIS earlier than 8 doesn't support SNI 2017-02-23 22:30:13 +11:00
Joe Niland
18effe0103 Detect IIS version and vary certificate association command depending on version 2017-02-23 22:30:13 +11:00
Jacek Tomasiak
baf84b4430 Ensure user/group/file_mode after line edit 
Ownership parameters are used in `line` only when the file doesn't exist
and `create` is enabled. After editing the file is saved with default ownership.
`managed` already handles file existence and `create` internally so it can be
called directly and will take care of the ownership and mode in all cases.
 2017-02-23 12:22:11 +01:00
Michael Calmer
81bd96e32d fix case in os_family for Suse 2017-02-23 12:01:05 +01:00
Nicolas Delaby
54cdacb680 Reduce scope of try except StopIteration wrapping 
Aimed to reduce amount of code where in one hand a 3 tuple were
returned and in the other hand a 2 tuple value.
 2017-02-23 11:48:21 +01:00
Mike Place
652044b18f
A note in the docs about mentionbot 2017-02-22 19:34:02 -07:00
Mike Place
d3e50b4f2f Merge pull request #39583 from cachedout/mentionbot_blacklist 
Add empty blacklist to mention bot
 2017-02-22 19:22:56 -07:00
Mike Place
62491c900d
Add empty blacklist to mention bot 2017-02-22 19:20:43 -07:00
Mike Place
5987c4e30e Merge pull request #39573 from thatch45/ssl_docs 
Added a few more comments to the ssl docs
 2017-02-22 19:17:13 -07:00
Mike Place
b8e321cbec Merge pull request #39577 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-22 19:10:11 -07:00
Nicole Thomas
cff9334929 Merge pull request #39574 from Ch3LL/update_release_notes 
Update 2016.11.3 release notes
 2017-02-22 17:10:22 -07:00
rallytime
397c756a01 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-02-22 16:51:31 -07:00
rallytime
c52cecd856 Fix syntax error leftover from incomplete merge-conflict resolution 2017-02-22 16:51:01 -07:00
Nicole Thomas
8352e6b44b Merge pull request #39579 from rallytime/fix-lint 
[2016.3] Pylint: Remove unused import
 2017-02-22 16:46:33 -07:00
rallytime
65889e1f30 [2016.3] Pylint: Remove unused import 2017-02-22 16:45:37 -07:00
Mike Place
43dba3254c Merge pull request #39578 from cachedout/2016.3 
Add mention-bot configuration
 2017-02-22 16:39:23 -07:00
Mike Place
344499eef7
Add mention-bot configuration 2017-02-22 16:37:54 -07:00
rallytime
7b9b3f700d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-22 16:27:08 -07:00
Ch3LL
c0f8c35df7 fix reference to set in docs 2017-02-22 16:09:16 -07:00
Ch3LL
663f6f159d add additional PRs to 2016.11.3 release notes 2017-02-22 16:04:05 -07:00
Thomas S Hatch
b230c35eac This should be good to go now 2017-02-22 14:29:24 -07:00