Commit Graph

59382 Commits

Author SHA1 Message Date
Justin Findlay
d96462af48 Merge pull request #27288 from rallytime/do-cleanup
Filter on 'name', not 'id', when listing images
2015-09-21 16:37:26 -06:00
Justin Findlay
1c551c6ad6 Merge pull request #27287 from rhealitycheck/mongo-returners-patch-1
Mongo returners patch 1
2015-09-21 16:35:55 -06:00
Erik Johnson
540a7dfcf1 Add default values for new minion config options 2015-09-21 16:49:53 -05:00
Erik Johnson
453b883820 Add a configurable timer for minion return retries
When a minion return cannot be processed in a timely manner, a
SaltReqTimeoutError is raised. However, the default wait time before the
minion will retry sending the return data was not being passed, so it
would wait a full 60 seconds.

This reduces that timeout to (by default) a maximum of 4 seconds, and
randomizes it to prevent a retry flood as you scale up the number of
minions.
2015-09-21 16:49:53 -05:00
rallytime
6e16fad760 Use name in all places, not id. 2015-09-21 14:36:49 -06:00
rallytime
9b34542cb0 Filter on 'name', not 'id', when listing images
And fix doc example of what --list-images looks like
2015-09-21 14:35:22 -06:00
rhealitycheck
8e698dfb07 Update mongo_return.py
same patch as for the future return. allows users to use older versions of pymongo if desired or the most recent ones.
2015-09-21 15:19:18 -05:00
rhealitycheck
2eb4744ccc Update mongo_future_return.py
Tracks the version so that it can compare pymongo versions and support older versions as well as the new versions that don't support "Connection"
2015-09-21 15:18:05 -05:00
Justin Findlay
02482c0572 Merge pull request #27278 from rallytime/bp-27256
Back-port #27256 to 2015.5
2015-09-21 13:27:51 -06:00
Justin Findlay
9061cccc4a Merge pull request #27280 from snarfmonkey/develop
minion log_level default is 'info' not 'warning'
2015-09-21 13:27:32 -06:00
Justin Findlay
688f24e9e4 Merge pull request #27283 from jtand/yumpkg_yum_fix
__grains__['osrelease'] returns a string
2015-09-21 13:18:44 -06:00
Justin Findlay
e36c019c37 Merge pull request #27277 from rallytime/bp-27230
Back-port #27230 to 2015.5
2015-09-21 13:06:13 -06:00
Justin Findlay
78d44a5c74 Merge pull request #27276 from rallytime/bp-27218
Back-port #27218 to 2015.8
2015-09-21 13:05:54 -06:00
Justin Findlay
d5ce81e8e7 Merge pull request #27275 from rallytime/bp-27213
Back-port #27213 to 2015.8
2015-09-21 13:05:18 -06:00
Nicole Thomas
2be21d6451 Merge pull request #27274 from rallytime/bp-27272
Back-port #27272 to 2015.8
2015-09-21 12:54:48 -06:00
justinta89
b73f5289b4 __grains__['osrelease'] returns a string. Cast to int for correct comparison 2015-09-21 12:03:30 -06:00
Justin Findlay
c0943dd4d1 Merge pull request #27271 from isbm/isbm-bufix-27270
Bugfix: crash on token authentication via API
2015-09-21 09:53:09 -06:00
Joseph Hall
b11ce6ac2a Merge pull request #27251 from rallytime/fix-19947
Add support for post_uri in SoftLayer cloud drivers
2015-09-21 09:43:16 -06:00
Julian Brost
1beddf6311 Fix error handling in salt.modules.file.statvfs
The old error messaged printed the wrong variable and was also
misleading as statvfs does not create any files.
2015-09-21 09:38:33 -06:00
Ben Hosmer
3ce77db1bc Fix typo in AWS doc config 2015-09-21 09:36:46 -06:00
Nasenbaer
8c0991d527 fixes #27217 clear_old_remotes clears wrong directory (gitfs) 2015-09-21 09:34:48 -06:00
macgyver13
5d4c90c479 Make get_event compatible with salt/client 2015-09-21 09:33:04 -06:00
Joseph Hall
f3ea3259a5 Make sure list_nodes_full contains a name attribute 2015-09-21 09:28:35 -06:00
Joseph Hall
35cf1f7183 Add request_instance() to gce driver 2015-09-21 09:21:57 -06:00
Nicole Thomas
2989247913 Merge pull request #27272 from techhat/ec2name
Make sure list_nodes_full contains a name attribute
2015-09-21 09:16:45 -06:00
Joseph Hall
fcd467d01b Make sure list_nodes_full contains a name attribute 2015-09-21 08:21:52 -06:00
Bo Maryniuk
fc524c17b9 Reduce the criteria that would match empty iterables as well as None or False values 2015-09-21 15:52:27 +02:00
Bo Maryniuk
3152af78b5 Fix the crash on token auth via API (http://git.io/vn4tx) 2015-09-21 15:48:07 +02:00
Justin Findlay
de6e5abe6c Merge pull request #27260 from bechtoldt/missing_refs
add missing module doc references
2015-09-20 23:48:37 -06:00
Arnold Bechtoldt
3a7d31a91c add missing module references 2015-09-20 13:22:32 +02:00
Justin Findlay
611d3e5760 Merge pull request #27256 from julianbrost/fix-statvfs-error-handling
Fix error handling in salt.modules.file.statvfs
2015-09-19 19:38:08 -06:00
Eric Cook
2bee0fd3d0 zsh-completion: add completion for salt-key 2015-09-19 18:35:39 -04:00
Eric Cook
6f4f971ea7 zsh-completion: add completion for salt-run 2015-09-19 18:32:23 -04:00
Eric Cook
973a2b46fd zsh-completion: remove -d, --doc, argument expectation
and small formatting changes.
2015-09-19 18:25:39 -04:00
Julian Brost
0312326e5e Fix error handling in salt.modules.file.statvfs
The old error messaged printed the wrong variable and was also
misleading as statvfs does not create any files.
2015-09-19 18:24:00 +02:00
Riccardo Ghetta
4d7f097e49 move skip_verify to last parameter 2015-09-19 10:03:17 +02:00
Justin Findlay
1a32b9f778 Merge pull request #27254 from jfindlay/version.2015.8
2015.2,2015.8,Beryllium -> 2015.8.0
2015-09-18 17:44:46 -06:00
Justin Findlay
b22286476e Merge pull request #27253 from jfindlay/version.2015.5
2015.5 -> 2015.5.0
2015-09-18 17:44:43 -06:00
Justin Findlay
e90412d3b8 Merge pull request #27252 from jfindlay/version.2014.7
2014.7 -> 2014.7.0
2015-09-18 17:44:39 -06:00
Justin Findlay
8ea15f498e 2015.2,2015.8,Beryllium -> 2015.8.0
Some features were erroneously reported as being added in 2015.2.
2015-09-18 16:35:15 -06:00
Justin Findlay
967e3bb72a 2015.5 -> 2015.5.0 2015-09-18 16:27:02 -06:00
rallytime
aafb776808 Add support for post_uri in SoftLayer cloud drivers 2015-09-18 16:24:51 -06:00
Justin Findlay
3d28307a00 2014.7 -> 2014.7.0 2015-09-18 16:08:47 -06:00
Mike Place
f3a847823b Merge pull request #27245 from rallytime/fix-25079
If two ssh keynames are found in DigitalOcean, abort and warn the user.
2015-09-18 15:42:36 -06:00
Mike Place
115c1ed8ec Merge pull request #27211 from whiteinge/local_batch-client
Add local_subset client
2015-09-18 15:42:00 -06:00
Mike Place
9c174e9fc2 Merge pull request #27246 from garethgreenaway/develop_ec2_create_snapshot_exception
Develop - cloud.ec2.create_snapshot exception
2015-09-18 15:41:29 -06:00
Mike Place
51a0193b54 Merge pull request #27244 from garethgreenaway/ec2_create_snapshot_no_return_data_exception
Exception in cloud.ec2.create_snapshot
2015-09-18 15:41:11 -06:00
Mike Place
e4a5b004ae Merge pull request #27241 from jfindlay/yumwarn
osrelease is only an integer for fedora
2015-09-18 15:40:50 -06:00
FELD Boris
6417161fd7 The CORS implementation was a bit naive about headers allowance.
A preflight request send the list of headers of the final request
in a special header ```Access-Control-Request-Headers```.
The server must returns the list of allowed header in the special header
```Access-Control-Allow-Headers```.

This PR just returns the whole list of headers but may allow filtering of some
of them quite easily. I'm not sure to see how filtering how headers may
impact security, if anyone has some leads.
2015-09-18 23:24:43 +02:00
Aaron S.
13f5f7bb3e default log_level is info, not warning
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
2015-09-18 13:59:45 -07:00