Commit Graph

66900 Commits

Author SHA1 Message Date
Erik Johnson
7d7cb45565 Fix outputter for state.apply
Because of an incorrectly configured ``__outputter__`` dunder dict,
``state.apply`` was falling back to the nested outputter. This corrects
the configuration, allowing ``state.apply`` to use the highstate
outputter as intended.
2016-03-22 11:59:23 -05:00
Erik Johnson
8b2d983324 Add reference to state tutorial to state.apply docstring 2016-03-22 11:20:12 -05:00
Erik Johnson
9b4fe8443e Move highstate usage details to top of state.apply docstring 2016-03-22 10:59:11 -05:00
Erik Johnson
74ee8c54bc Clarify prior role of state.highstate in states tutorial 2016-03-22 10:58:45 -05: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
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply
Resolves #32037.
2016-03-21 22:56:17 -05: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
twangboy
548604bce6 Refactor install 2016-03-21 17:59:28 -06:00
twangboy
7daf9d8277 Remove unit tests without logic 2016-03-21 17:47:34 -06:00
twangboy
5658753a5f Add already installed check 2016-03-21 17:33:25 -06:00
twangboy
3b05583928 Remove unecessary SaltInvocationError 2016-03-21 17:22:38 -06:00
twangboy
523e125436 Fix forget portion 2016-03-21 16:54:51 -06:00
twangboy
66ea15c0be Fix install_forget test... again 2016-03-21 16:51:48 -06:00
twangboy
fb78f539b7 Fix install_forget test 2016-03-21 16:49:31 -06:00
twangboy
77920265d1 Add documentation/tests for forget 2016-03-21 16:45:29 -06:00
twangboy
ea823932c2 Improve error on mac_utils 2016-03-21 16:20:31 -06:00
twangboy
58cd2a7c9a Add some tearDown functions 2016-03-21 16:08:03 -06:00
twangboy
aad91b5dc8 Change remove to forget 2016-03-21 16:02:01 -06:00
twangboy
b4c3f59929 Fix test 2016-03-21 15:50:19 -06:00
twangboy
ee7ab8500d Add import os 2016-03-21 15:43:30 -06: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
twangboy
63864e994b Add remove function 2016-03-21 15:26:58 -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
twangboy
336f156ee3 Add SaltInvocationError if already installed 2016-03-21 15:16:48 -06:00
twangboy
5ea665cfc9 Fix dunder virtual 2016-03-21 15:09:50 -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
twangboy
97196e672b Fix test_install integration test 2016-03-21 15:07:06 -06:00
twangboy
933e275b3a Add integration tests 2016-03-21 15:03:31 -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