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

85477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
d9e5c2d8d5 Merge pull request #43326 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 15
 2017-09-05 11:57:31 -06:00
John Jawed
1b4583b425 Fix #43295, better handling of consul initialization issues 2017-09-05 09:47:21 -07:00
Robert Mader
a4c693bf2f Use quiet mode of lvdisplay in lvpresent 2017-09-05 18:18:58 +02:00
Robert Mader
9e64ea814c Add quiet mode to lvdisplay 2017-09-05 18:16:15 +02:00
rallytime
ed9b45ceaa Adjust a couple more tests to handle __utils__['state.check_result'] mocking 2017-09-05 10:11:11 -04:00
Lukas Erlacher
ca22f4f3b4 Add replace parameter to file.recurse state 
Simply add `replace` parameter and pass it through to `managed`.

Closes #16313
 2017-09-05 10:18:07 +10:00
Mircea Ulinic
d90ed050ba Import fopen function from salt.utils.files or salt.utils 
The fopen function does not seem to be available in the
existing Salt releases, under the __utils__ dunder
(It will be in Oxygen as the `files.fopen` key).
For backwards compatibility and this module to be
able to be ported as extension modules when running
earlier releases than Oxygen, we can import the fopen
function in a try-except block, looking firstly to
import it from the new salt.utils.files module.
 2017-09-04 13:45:23 +00:00
Mircea Ulinic
8193906308 Fix file handler bug 2017-09-04 13:29:40 +00:00
Mircea Ulinic
38f85a6d2f Lint 2017-09-04 13:29:40 +00:00
Mircea Ulinic
ec2a83bade More doc typos and correct tests 2017-09-04 13:29:40 +00:00
Mike Place
07ea624197 Fix obvious typo 2017-09-04 13:29:40 +00:00
Mircea Ulinic
80c5479dfa Textfsm execution module autodoc 2017-09-04 13:29:39 +00:00
Mircea Ulinic
8d968fa886 Deps: documentation note and load condition 2017-09-04 13:29:39 +00:00
Mircea Ulinic
ed54a341b0 Improve opts and provide doc 2017-09-04 13:29:39 +00:00
Mircea Ulinic
3e0d675e8c More verbose debug logs 2017-09-04 13:29:39 +00:00
Mircea Ulinic
20ee34da50 Define index function and avoid redundant code 2017-09-04 13:29:39 +00:00
Mircea Ulinic
012bccf0eb New execution module: TextFSM 2017-09-04 13:29:39 +00:00
Petr Michalec
54acbc8581 Merge branch 'develop' into nacl_for_ext_pillar 2017-09-04 09:24:56 +02:00
Petr Michalec
827802f111
Decrypt NACL passwords on ext_pillar 2017-09-02 07:58:00 +02:00
Brady Catherman
484bc75457 Merge branch 'develop' into develop 2017-09-01 22:26:20 -06:00
Brady Catherman
ae5796a075 Ensure that this command doesn't fail randomly. 
Sometimes when running win_pki.py.import_cert will return a help message
asserting that there was an argument error. This is because the
underlying json coming out of PowerShell might actually return nil
(None) so the .get() with a default return doesn't properly protect
against a None getting iterated.
 2017-09-01 16:20:58 -06:00
rallytime
efef4f6a9b Reduce the number of days an issue is stale by 15 2017-09-01 17:05:16 -04:00
rallytime
4322f009cf Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/auth/__init__.py
  - salt/auth/ldap.py
  - salt/grains/metadata.py
  - salt/master.py
  - salt/modules/apache.py
  - salt/modules/dockermod.py
 2017-09-01 16:37:29 -04:00
rallytime
d891433214 Adjust test mocking to handle __utils__['state.check_result'] 2017-09-01 16:09:59 -04:00
rallytime
8127bca9ed Use __utils__ where possible for moved state utils 
And update all references to new state names in salt.utils.state.py
 2017-09-01 16:09:59 -04:00
rallytime
0b35a70be2 Change function names to not be so redundant 
Now that the name of the util file is state.py, the function names can be
shortened:

- check_state_result --> check_result
- gen_state_tag --> gen_tag
 2017-09-01 16:09:59 -04:00
rallytime
4a86f23bf1 Move state-related utils to salt.utils.state.py 
Moves the following functions from `salt.utils` to `salt.utils.state`:
- gen_state_tag
- search_onfail_requisites
- check_onfail_requisites
- check_state_result

Original functions have a deprecation warning added and all references
in Salt code were updated to use the new function path, including moving
some unit tests.
 2017-09-01 16:09:59 -04:00
Mike Place
0e262b8c0d Merge pull request #43253 from rallytime/utils-color-moves 
Move get_colors and get_color_theme to salt.utils.color.py
 2017-09-01 12:44:40 -06:00
Mike Place
367668a0a3 Merge pull request #43268 from rallytime/bp-43237 
Back-port #43237 to 2017.7
 2017-09-01 12:17:12 -06:00
Mike Place
24962587bc Merge pull request #43269 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-01 12:12:36 -06:00
Mike Place
02504dd363 Merge pull request #43270 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-01 12:09:45 -06:00
Mike Place
ece0e393ef Merge pull request #43283 from DSRCorporation/bugs/42459_broken_ldap_groups 
Fix ldap token groups auth.
 2017-09-01 11:49:45 -06:00
Nicole Thomas
4f023c4cb6 Merge pull request #43149 from BenoitKnecht/2017.7.1 
Fix iptables.get_rules when rules contain --nfmask or --ctmask
 2017-09-01 11:57:04 -04:00