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
66,657 Commits 24 Branches 182 Tags 341 MiB
1af2e41a17
Commit Graph

66657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
twangboy
100bcefa60 Fix unit tests 2016-03-21 12:15:08 -06:00
Mike Place
a940c64981 Merge pull request #31994 from twangboy/mac_softwareupdate_int 
Integration tests for mac_softwareupdate.py
 2016-03-21 12:01:14 -06:00
Andreas Lutro
e9fe661e72 add integration test for alternatives state 
the alternatives state module has been through some contradictory
changes recently. an integration test should help validate that it
actually works.
 2016-03-21 17:53:01 +01:00
Nicole Thomas
ce2bf355c2 Merge pull request #32010 from rallytime/bp-31794 
Back-port #31794 to 2016.3
 2016-03-21 09:55:35 -06:00
Nicole Thomas
7d153b426c Merge pull request #32011 from rallytime/bp-31896 
Back-port #31896 to 2016.3
 2016-03-21 09:55:06 -06:00
Nicole Thomas
cf174940f5 Merge pull request #32007 from sjorge/2016.3-smartos-nl 
salt.states.smartos should handling newlines better
 2016-03-21 09:16:23 -06:00
Mike Place
63133ebbb5 Add docs for master_tries 
Refs #31794
 2016-03-20 10:27:16 -06:00
Sergey Kizunov
d234c8627a Disabled pylint warning 
I believe the pylint warning to be a false positive, so I disabled it
and added a comment explaining why.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-20 10:23:51 -06:00
Sergey Kizunov
ef7f3ed597 Add master_tries config option for minions 
Description of `master_tries` config option:
- The number of attempts to connect to a master before giving up.
Set this to -1 for unlimited attempts. This allows for a master to have
downtime and the minion to reconnect to it later when it comes back up.
In 'failover' mode, it is the number of attempts for each set of masters.
In this mode, it will cycle through the list of masters for each attempt.

This is different than `auth_tries` because `auth_tries` attempts to
retry auth attempts with a single master. `auth_tries` is under the
assumption that you can connect to the master but not gain
authorization from it. `master_tries` will still cycle through all
the masters in a given try, so it is appropriate if you expect
occasional downtime from the master(s).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-20 10:23:51 -06:00
Jorge Schrauwen
90065969f7 drop uneeded close 2016-03-20 14:40:17 +00:00
Jorge Schrauwen
6f19702385 fix handling of metadata and other values with spaces in them for salt.states.smartos 2016-03-20 14:34:59 +00:00
Kevin Bowling
3efc6fb4c0 Add an alias fetch function to grains and pillar module get 2016-03-19 06:34:43 -07:00
twangboy
3d7ff12019 Fix line lengths 2016-03-18 17:59:07 -06:00
twangboy
787835a13a Fix tests for sleep functions 2016-03-18 17:57:02 -06:00
twangboy
dc62a1576b And one last time 2016-03-18 17:51:04 -06:00
twangboy
818be0506a Fix sleep function returns... one final time 2016-03-18 17:49:10 -06:00
twangboy
4b9e857e7c Fix sleep function returns... again 2016-03-18 17:46:30 -06:00
twangboy
4986facb88 Fix sleep returns 2016-03-18 17:45:04 -06:00
twangboy
a15aaff241 Add remaining integration tests 2016-03-18 17:36:49 -06:00
twangboy
4302adb1fd Return boolean values 2016-03-18 17:17:55 -06:00
twangboy
648045daf9 Fix return for get functions 2016-03-18 17:16:08 -06:00
twangboy
2517abafca Integration tests for sleep functions 2016-03-18 17:11:35 -06:00