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,440 Commits 24 Branches 182 Tags 341 MiB
60d80e7cda
Commit Graph

85440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Nicole Thomas
390ea9e2da Merge pull request #43065 from wcannon/develop 
saltcheck module
 2017-09-01 11:48:24 -04:00
Nicole Thomas
cf2b75bb86 Merge pull request #43265 from gtmanfred/2017.7 
make sure meta-data grains work on ec2
 2017-09-01 11:31:12 -04:00
Nicole Thomas
618b221895 Merge pull request #43299 from twangboy/win_fix_netapi_cherrypy 
Fix `unit.netapi.rest_cherrypy.test_tools` for Windows
 2017-09-01 11:13:42 -04:00
Nicole Thomas
fd74acb603 Merge branch '2017.7' into win_fix_netapi_cherrypy 2017-09-01 09:10:51 -04:00
Nicole Thomas
aee654da92 Merge pull request #43300 from twangboy/win_fix_netapi_rest_tornado 
Fix `unit.netapi.rest_tornado.test_handlers` for Windows
 2017-09-01 09:10:10 -04:00
twangboy
c93d2ed386 Use os.sep instead of '/' 2017-08-31 17:01:14 -06:00
twangboy
3fbf24b91a Use os.sep instead of '/' 2017-08-31 16:56:58 -06:00
Dmitry Kuzmenko
3ad6911210 Fix for tests: don't require 'groups' in the eauth token. 2017-08-31 20:39:35 +03:00
Nicole Thomas
0d1b715b97 Merge pull request #43236 from akurach/patch-1 
Update __init__.py
 2017-08-31 11:25:31 -04:00
Nicole Thomas
d1e59e752d Merge pull request #43281 from brejoc/fix_for_install_time_rh2 
Checking install_time for '(none)' value
 2017-08-31 10:19:07 -04:00
wcannon
2a484fc46f Merge branch 'develop' into develop 2017-08-31 09:01:41 -05:00
Dmitry Kuzmenko
1f104cf85b Fix ldap token groups auth. 2017-08-31 16:52:44 +03:00
Nicole Thomas
46cd87d815 Merge pull request #43225 from lomeroe/fix_43166_develop 
fix issues in PR #43116
 2017-08-31 09:43:56 -04:00
Nicole Thomas
aed2975979 Merge pull request #43278 from gtmanfred/virtualbox 
bootstrap can come from dunders
 2017-08-31 09:31:19 -04:00
Jochen Breuer
7aeed33575
Checking install_time for '(none)' value 
RedHat systems might in some cases return '(none)' as install_time,
which would cause a ValueError.

We are checking for '(none)' now. install_date and install_date_time
are being set to None in that case.
 2017-08-31 09:48:07 +02:00
Daniel Wallace
c4ae2de30f bootstrap can come from dunders 2017-08-30 20:38:50 -06:00
William Cannon
58eef3dc2c fixed dunder usage problem in unit test 2017-08-30 17:00:27 -05:00
wcannon
c080b263d5 Merge branch 'develop' into develop 2017-08-30 15:54:57 -05:00
William Cannon
a3bbe160fc uncommented salt.utils import 2017-08-30 15:45:46 -05:00
Nicole Thomas
654ff158b9 Merge pull request #43248 from treba123/patch-3 
Add **kwargs to some file states
 2017-08-30 16:30:27 -04:00
Nicole Thomas
479e0e06ac Merge pull request #42975 from brejoc/tests-for-kubernetes-module 
Added unit tests for Kubernetes module
 2017-08-30 16:30:15 -04:00
Nicole Thomas
ca7df1d4cf Merge pull request #43176 from terminalmage/issue42935 
docker_image states: Handle Hub images prefixed with "docker.io/"
 2017-08-30 16:08:13 -04:00
Nicole Thomas
b72718ee82 Merge pull request #42811 from hibbert/allow_creation_token_boto_efs/develop 
develop: Allow creation_token to be passed into create_file_system an…
 2017-08-30 16:02:18 -04:00
Nicole Thomas
e2f4d5b1bf Merge pull request #43243 from treba123/patch-1 
Add **kwargs to mount.mounted state
 2017-08-30 16:01:52 -04:00
Nicole Thomas
0bf860ad1d Merge pull request #43245 from treba123/patch-2 
Add **kwargs to salt.state state
 2017-08-30 15:40:15 -04:00