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
85,769 Commits 24 Branches 182 Tags 341 MiB
ed7ac43d89
Commit Graph

85769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
e9a5fd4f93 Merge pull request #43195 from moio/expand-list_pkg-attr-parameter 
list_pkg attr parameter: add support for epoch, release
 2017-09-07 13:36:22 -04:00
Nicole Thomas
6d13535ed0 Merge pull request #43193 from jettero/template-dne-again 
Prevent spurious "Template does not exist" error
 2017-09-06 16:16:57 -04:00
Aneesh Agrawal
60d80e7cda Add utils function to merge state returns 
This makes it possible to merge the state return
for a subresource into a main state return.
This is useful for configuring e.g. alarms to go along with a resource.
 2017-09-06 18:14:04 +00:00
Nicole Thomas
cde8aed2cf Merge branch '2017.7' into template-dne-again 2017-09-06 14:04:58 -04:00
Alexandru Bleotu
103ef69016 Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-06 18:49:37 +01:00
Sergey Kizunov
281e471853 Fix system.set_system_time when no hw clock is present 
If a hardware clock is not present, then the `cmd.run_all` call in
`has_settable_hwclock` will return a non-zero retcode. If
`ignore_retcode` is not set to True in that call, then it will set
`__context__['retcode']` to that code which will cause the job to
appear as if it failed (due to non-zero retcode) even though it
didn't really fail.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-06 11:45:02 -05:00
Alexandru Bleotu
33feda7a5b Mocked salt.utils.args.get_function_argspec instead of inspect.getargspec in all external pillar data tests 2017-09-06 12:26:40 -04:00
Alexandru Bleotu
ec9f29cb56 Changed inspect.getargspec to salt.utils.args.get_function_argspec 2017-09-06 12:26:38 -04:00
Nicole Thomas
7d462d29c2 Merge branch 'develop' into expand-list_pkg-attr-parameter 2017-09-06 12:15:01 -04:00
Nathan Fish
0ce48eecd7 states/nfs_export: add __virtual__() 2017-09-06 11:03:02 -05:00
Nathan Fish
889a556e85 modules/nfs3: linting 2017-09-06 10:40:37 -05:00
Gareth J. Greenaway
0acf0ffd69 Swapping list() for []. 2017-09-06 07:17:16 -07:00
Gareth J. Greenaway
3104bde2e4 Replacing double quotes with single quotes. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
4cd38d7cd5 Updating per requests. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
b9b5181046 Fixing lint, too many spaces. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
ace483f57a Fixing various lint issues 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
c228cb490c Allow editing previous messages and having them resubmitted to the Slack engine. Fixing passing kwargs. Fixing passing pillar values. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
43d8c65bf4 Swapping slack engine over to using a class for easier passing around for bits. General cleanup and fixing of messages when things go wrong. 2017-09-06 07:09:49 -07:00
rallytime
7b07b58396 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/key.py
  - salt/modules/yumpkg.py
 2017-09-06 09:44:34 -04:00
rallytime
5701d54516 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
 2017-09-06 09:39:27 -04:00
Andreas Thienemann
6aefa5c3f8 Update unit test to provide osmajorrelease grain. 2017-09-06 03:46:00 +02:00
Mike Place
1ddf818b41 Merge pull request #42336 from cloudflare/textfsm-mod 
New execution module: textfsm
 2017-09-05 17:28:30 -06:00
Mike Place
0c986f5eba Merge pull request #43361 from rallytime/bp-43329 
Back-port #43329 to 2016.11
 2017-09-05 17:23:00 -06:00
Mike Place
22287439e6 Merge pull request #42903 from junovitch/issue-35840-fix-preserve-minion-cache-2016.11 
Fix 'preserve_minion_cache: True' functionality (fixes #35840)
 2017-09-05 16:57:13 -06:00
Mike Place
7ba405add5 Merge pull request #43050 from epcim/nacl_for_ext_pillar 
Nacl for ext pillar [WIP]
 2017-09-05 16:51:19 -06:00
Nicole Thomas
015cbc57d9 Merge pull request #43159 from jubrad/bp-43018 
Bp 43018
 2017-09-05 18:29:15 -04:00
Nicole Thomas
f19274e1b4 Merge pull request #43222 from rallytime/oxygen-warnings-env 
Remove deprecation warnings for "env"
 2017-09-05 18:24:54 -04:00
Nicole Thomas
cfc08147e9 Merge pull request #43304 from duk3luk3/feature-16313-file-recurse-replace 
Feature: Add `replace` parameter to file.recurse state
 2017-09-05 18:24:27 -04:00
Mike Place
4860e10757 Merge pull request #43360 from terminalmage/sj-496 
Fix failing tests in Fedora
 2017-09-05 16:23:12 -06:00
Mike Place
a414325a82 Merge pull request #43070 from lyft/support-states-returning-a-list-of-comments 
Support states returning a list for ret['comment']
 2017-09-05 16:19:26 -06:00
Mike Place
c7e60a71f7 Merge pull request #43082 from johnj/distributed-master-selection 
Add distributed as a master_type option
 2017-09-05 16:17:39 -06:00
Pablo Hernandez
49677b4854 Merge branch 'develop' into docker-present-pass-kwargs 2017-09-05 14:59:09 -07:00
Mike Place
f902bd8bc9 Merge pull request #43152 from garethgreenaway/adding_custom_beacons 
Adding custom beacons with beacon module
 2017-09-05 15:37:39 -06:00
Colton Myers
ca0b41f74a
Document lack of support for multiple default gateways 2017-09-05 15:35:06 -06:00
Mike Place
6e1b541b46 Merge pull request #43232 from terminalmage/gitfs-inheritance 
Improve inheritance in salt.utils.gitfs
 2017-09-05 14:37:05 -06:00
Mike Place
086b220091 Merge pull request #43238 from s0undt3ch/2017.7 
Include the line number by default on the log file format
 2017-09-05 14:31:53 -06:00
Mike Place
4ba2dbe41e Merge pull request #43244 from rallytime/release-branch-clarifications 
Update release branch section with a few more details
 2017-09-05 14:27:58 -06:00
John Jawed
b09e5b4379 Fix #43295, better handling of consul initialization issues 2017-09-05 16:27:42 -04:00
Mike Place
11d26d446b Merge pull request #43303 from liquidgecka/develop 
Ensure that the win_pki.import_cert module doesn't fail randomly.
 2017-09-05 14:21:09 -06:00
Mike Place
9c57869234 Merge pull request #43276 from rallytime/utils-state-moves 
Move state-related utils to salt.utils.state.py
 2017-09-05 14:20:08 -06:00
Erik Johnson
433bca14b1 Fix KeyError in yumpkg configparser code on Python 3 
It looks like the configparser in Python 3 does not insert the
`__name__` key in each section. Popping it without a default causes a
KeyError on Python 3. This commit fixes that KeyError.
 2017-09-05 15:13:22 -05:00
Mike Place
09dc58cde5 Merge pull request #43294 from twangboy/win_build_scripts 
Win build scripts
 2017-09-05 14:12:53 -06:00
Nicole Thomas
c20b919d3b Merge pull request #43355 from treba123/patch-1 
Silence error message in lvm.lv_present
 2017-09-05 16:10:53 -04:00
Erik Johnson
f6c16935d8 Move --showduplicates before repository-packages 
As of Fedora 26, dnf interprets arguments after "repository-packages" as
arguments to the repository-package subcommand, which breaks
pkg.list_repo_pkgs on that Fedora release. Moving this argument earlier
in the command allows pkg.list_repo_pkgs to work.
 2017-09-05 15:10:05 -05:00
Mike Place
dac73fccf4 Merge pull request #43329 from johnj/fix-43295 
Fix #43295, better handling of consul initialization
 2017-09-05 14:06:04 -06:00
Aneesh Agrawal
ba63920874 Support states returning a list for ret['comment'] 
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.

The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.

Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
 2017-09-05 19:52:42 +00:00
Nicole Thomas
1a012eb3d7 Merge pull request #43359 from gtmanfred/ipaddr 
ipaddr_start ipaddr_end for el7
 2017-09-05 15:44:23 -04:00
Mike Place
21ab306ef4 Merge pull request #43322 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-05 12:21:25 -06:00
Mike Place
150c853140 Merge pull request #43323 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-05 12:20:13 -06:00
Mike Place
8f88111be8 Merge pull request #43247 from rallytime/mentionbot-backports 
Back-port various mention bot settings to 2016.11
 2017-09-05 12:17:53 -06:00