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
66,688 Commits 24 Branches 182 Tags 341 MiB
c57a232809
Commit Graph

66688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
c57a232809 Catch traceback when LDAP returns something other than the nested tuple 2016-03-23 14:29:47 -06:00
C. R. Oldham
4af4280d04 Fix issue causing automated tests to fail. 2016-03-23 14:29:47 -06:00
Mike Place
eb139ab935 Merge pull request #32089 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-23 11:56:58 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 10:56:25 -06:00
Mike Place
bc9a899bc8 Merge pull request #32074 from Xiami2012/fix_iptables 
Fix code for proto args in modules.iptables
 2016-03-23 10:37:58 -06:00
Mike Place
e19fe847bd Merge pull request #32062 from rallytime/mac-assistive-tests 
Mac assistive tests
 2016-03-23 09:51:36 -06:00
Nicole Thomas
57cf405fd6 Merge pull request #31552 from alprs/fix-localectl 
Bring back localectl parsing in locale module for when dbus module is unavailable
 2016-03-23 09:47:27 -06:00
Nicole Thomas
11f2ba829d Merge pull request #32071 from jtand/skip_client_test_if_not_zmq 
Skipped test if zeromq is not transport
 2016-03-23 09:15:32 -06:00
Xiami
aae3af7e49 Fix code for proto args in modules.iptables 
In modules.iptables.build_rule:
  Fix incorrect output when providing proto='!tcp'
  Make salt cleverer when both 'protocol' and 'proto' in kwargs.

NOTE: Conflicts in merge commit 000de95 are wrong dealed with.
 2016-03-23 18:19:18 +08:00
Justin Anderson
df9abd5021 Skipped test if zeromq is not transport 2016-03-22 16:01:18 -06:00
Nicole Thomas
1af2e41a17 Merge pull request #32063 from rallytime/bp-31995 
Back-port #31995 to 2016.3
 2016-03-22 15:59:43 -06:00
Nicole Thomas
0ea909b617 Merge pull request #32064 from rallytime/bp-31961 
Back-port #31961 to 2016.3
 2016-03-22 15:44:42 -06:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
Gary Richmond
d2949ff2f5 Alphabetized region list; corrected curly quote 2016-03-22 14:36:28 -06:00
Gary Richmond
9fffb5d1e9 Add support for ap-northeast-2 and us-gov-west-1 regions in AWS 2016-03-22 14:36:28 -06:00
Nicole Thomas
3e08dd0a93 Merge pull request #32053 from basepi/fix_rabbitmq 
[2015.8] Fix rabbitmq_user.present tag handling
 2016-03-22 14:33:51 -06:00
rallytime
b1bdb688ae Add unit tests for new remove function, too. 2016-03-22 14:25:49 -06:00
rallytime
88ba210f86 Add mac_assistive integration tests 
- Updates mac_assistive module to use cmd.run_all
- Updates current mac_assistive_test unit tests with cmd.run_all change
- Adds module integration tests for mac_assistive execution module
 2016-03-22 14:11:40 -06:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Colton Myers
bed048e1e7 Remove leftover arg (lint) 2016-03-22 11:50:38 -06:00
Colton Myers
08868cb32a Fix tag handling code for rabbitmq_user.present 2016-03-22 11:16:17 -06:00
Mike Place
5a20dae07b Merge pull request #32036 from jfindlay/mac_service_revert 
mac_service: use load/unload for service operations
 2016-03-22 11:14:02 -06:00
Colton Myers
3b6d25b4e9 Remove leading whitespace on tags 
Was converting '[admin, monitoring]' to ['admin', ' monitoring']

Now converts to ['admin', 'monitoring']
 2016-03-22 11:03:57 -06:00
Nicole Thomas
7ddecc755c Merge pull request #32047 from jtand/lint_fixes 
Removed some unused imports for lint fixes
 2016-03-22 09:47:50 -06:00
Nicole Thomas
468c0c6fb1 Merge pull request #32035 from tonybaloney/2016.3 
Document what is in the Dimension Data Cloud support in SaltStack 2016.3
 2016-03-22 09:16:50 -06:00
Justin Anderson
e86797731a Removed some unused imports for lint fixes 2016-03-22 09:15:20 -06:00
Justin Findlay
2534dce5c7 modules.mac_service: use old style launchctl cmds 2016-03-21 21:08:51 -06:00
Justin Findlay
31a47c0957 modules.mac_service: run launchctl through single fcn 2016-03-21 21:08:51 -06:00
Justin Findlay
9b4ecccc7a modules.mac_service: match status to linux service.status 2016-03-21 21:08:51 -06:00
Justin Findlay
44c64f20ca modules.mac_service: no spam debug log with service guts 2016-03-21 21:08:51 -06:00
Justin Findlay
a3e6feed82 modules.mac_service: normalize file_name 2016-03-21 21:08:51 -06:00
Justin Findlay
7340a29541 modules.mac_service: add show to API similar to systemd 2016-03-21 21:08:51 -06:00
anthony-shaw
c0aa856946 Document what is in the Dimension Data Cloud support in SaltStack 2016.3 2016-03-22 11:14:26 +11:00
Mike Place
2a4c0cf439 Merge pull request #31993 from DSRCompany/features/intuit_syndic_async 
Make Syndic asynchronous.
 2016-03-21 15:36:09 -06:00
Nicole Thomas
750e970d57 Merge pull request #32028 from rallytime/merge-31884 
Merge #31884 with pylint fixes
 2016-03-21 15:19:57 -06:00
Mike Place
4e21100095 Merge pull request #31855 from kev009/grains-pillar-fetch 
Add an alias fetch function to grains and pillar module get
 2016-03-21 15:18:55 -06:00
Mike Place
975ddffb17 Merge pull request #32027 from skizunov/develop2 
`AsyncTCPPubChannel.send` should not raise StreamClosedError
 2016-03-21 15:08:03 -06:00
rallytime
92ea2709d7 More pylint fixes 2016-03-21 14:55:03 -06:00
Mike Place
0a1753b83d Merge pull request #31885 from Ch3LL/add_mac_brew_tests 
renamed brew.py to mac_brew.py and added tests
 2016-03-21 14:22:47 -06:00
Mike Place
a496806fa2 Merge pull request #32000 from twangboy/mac_power_int 
Integration tests for mac_power.py
 2016-03-21 14:18:57 -06:00
rallytime
3e61603d5b Pylint fix for #31884 
Merges #31884
 2016-03-21 14:18:29 -06:00
Mike Place
553ecaca25 Merge pull request #32023 from sbreidba/bugfix_32004 
Move constant declaration into member variable to avoid issues when m…
 2016-03-21 14:18:23 -06:00
Ch3LL
aa519814f2 reverse the format indices 2016-03-21 14:17:27 -06:00
Ch3LL
3f2b851203 add more tests for mac_group 2016-03-21 14:17:27 -06:00
Mike Place
65c634d197 Merge pull request #32026 from techhat/decodeout 
Don't require the decode_out file to already exist
 2016-03-21 14:17:05 -06:00
Nicole Thomas
d85dfbea50 Merge pull request #32001 from alprs/fix-alternatives_state_integration_tests 
Add integration test for alternatives state
 2016-03-21 13:40:45 -06:00
Sergey Kizunov
396f735a0d AsyncTCPPubChannel.send should not raise StreamClosedError 
Some callers, such as `AsyncAuth.sign_in` expect `AsyncTCPPubChannel.send`
to succeed or return a specific exception such as `SaltReqTimeoutError` or
`SaltClientError`. If a different exception is thrown, it will not try to
reconnect to any master(s) and so the salt-minion is effectively inactive.
When the salt-master disconnects (eg shutdown for maintenance), internally
there will be a `tornado.iostream.StreamClosedError` in the salt-minion.
Now, we convert this to a `SaltClientError` so that it will be more
recognizable to the caller.

Also, sometimes `SaltMessageClient.timeout_message` is still invoked after
a `StreamClosedError`. To avoid a `KeyError`, always check to make sure
`message_id` is still in `self.send_future_map` before trying to access
it.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-21 14:38:21 -05:00
Andreas Lutro
195fd53713 Add a basic integration test for locale module 2016-03-21 20:22:16 +01:00
Andreas Lutro
a31cdf1968 Fix and improve locale module for systemd 
- parse localectl output when dbus module is unavailable
- use dbus/localectl whenever the system is detected to have been booted
  with systemd as the init system, regardless of os grain
- simplify and improve logic when parsing dbus/localectl
  - don't rely on exceptions to find the end of the locale params
  - make sure that all locale params get returned
 2016-03-21 20:22:16 +01:00
Joseph Hall
f27da41b71 Don't require the decode_out file to already exist 2016-03-21 13:15:31 -06:00