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,855 Commits 24 Branches 182 Tags 341 MiB
054f7c9551
Commit Graph

85855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
c0d81aa1ce Use salt.utils.path.readlink 
instead of __salt__['file.readlink']
 2017-09-06 13:03:14 -06:00
twangboy
7c4460164b Fix alternatives for Windows 
Not sure this is necessary... I don't think alternatives is a thing in
Windows. Anyway, it uses `__salt__['file.readlink']` instead of
`os.readlink` as there is no `os.readlink` in Windows.
Modifies the tests to mock `__salt__['file.readlink']` instead of
`os.readlink`
 2017-09-06 13:03:14 -06: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
Nicole Thomas
fc587f784a Merge pull request #43105 from aogier/43086-no-member 
groupadd module: string does not have attribute 'extend', plus homogeneous `cmd` parm building
 2017-09-06 11:49:43 -04:00
Nathan Fish
889a556e85 modules/nfs3: linting 2017-09-06 10:40:37 -05:00
Nicole Thomas
5111cf8bad Merge branch '2016.11' into 43086-no-member 2017-09-06 10:41:18 -04:00
Nicole Thomas
d97a680372 Merge pull request #43333 from damon-atkins/2016.11 
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug
 2017-09-06 10:21:34 -04: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
Damon Atkins
92de2bb498 Update doco 2017-09-06 12:31:51 +10: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
twangboy
a94319a082 Make sure formatting of TEST_FILE_CONTENT matches original 2017-09-05 17:03:50 -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
twangboy
6263bc8983 Remove print statement 2017-09-05 16:48:58 -06:00
twangboy
79cd3831ae Fix empty value preserved test 2017-09-05 16:44:12 -06:00
twangboy
85997391f1 Is this handled the same on Linux and Windows 2017-09-05 16:32:43 -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
rallytime
b4c0516cd5 Change strings in master.py to have u'' 2017-09-05 18:14:22 -04:00
rallytime
f438e707b8 Use {} instead of dict() in error returns 2017-09-05 18:07:03 -04:00
Pablo Hernandez
49677b4854 Merge branch 'develop' into docker-present-pass-kwargs 2017-09-05 14:59:09 -07:00
rallytime
79c4ff7741 Simplify check for auth_key in auth.authenticate_key 2017-09-05 17:46:40 -04: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
rallytime
b93392dfb7 Return a SaltInvocationError when passing incorrect function pattern 
When calling an incorrectly formatted wheel or runner function, we should
be raising a SaltInvocationError with a hint to check function syntax rather
that raising an Eauth authentication error.

This PR does several things:

- Adds a dictionary error return when the function syntax passed through to
`utils.minions.CkMinions.spec_check` does not match the expected `module.function`
syntax
- Handles the return of this new dictionary error (instead of previous `False` return)
wherever the spec_check function is called. This is handled up the stack in
`master.py` and `masterapi.py`.
- Reworks the runner and wheel functions in `master.py` and `masterapi.py` to
help make those functions more DRY (see `salt.auth.check_authentication` function).
- Adds tests for all of these changes (written before the runner and wheel functions
were moved to use the new salt.auth.check_authentication function)  to help prevent
regressions.
- Fixes a couple of places where unit tests exposed potential stacktraces.
- Adjusts one previous unit test concerning the dictionary error change from spec_check
 2017-09-05 17:08:50 -04: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