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
38,389 Commits 24 Branches 182 Tags 341 MiB
f92fd17d46
Commit Graph

38389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
f92fd17d46 Merge pull request #21822 from basepi/bp-21820 
[2014.7] Backport #21820 to 2014.7
 2015-03-19 14:39:21 -06:00
Colton Myers
3870c666f3 Pass in the load you just checked for 
Should fix the remaining job cache syndic issues
 2015-03-19 13:29:10 -06:00
Nicole Thomas
737ebb4ff6 Merge pull request #21818 from basepi/bp-21781 
[2014.7] Backport #21781 to 2014.7
 2015-03-19 13:24:23 -06:00
Colton Myers
e386db2c34 Update syndic_config test for new cachedir 2015-03-19 11:33:09 -06:00
Colton Myers
8d406c1642 Fix syndic to get the load for __load__, not the jid 
Fixes #21495
 2015-03-19 11:33:08 -06:00
Colton Myers
d40b3874c5 Fix syndic to use master cachedir 2015-03-19 11:33:08 -06:00
jfindlay
c09b737ace Merge pull request #21786 from rallytime/bp-21739 
Backport #21739 to 2014.7
 2015-03-19 01:39:52 -06:00
jfindlay
e7222c03b0 Merge pull request #21785 from rallytime/bp-21738 
Backport #21738 to 2014.7
 2015-03-19 01:38:57 -06:00
Thomas S Hatch
efe7d097d7 Merge pull request #21780 from cachedout/syndic_client_2014_7 
Backport #21775 to 2014.7
 2015-03-18 17:04:36 -06:00
Nicolas Delaby
eddef004a8 If there no containers in the response it does not mean the command failed. 
It could be there is no container at all.
 2015-03-18 16:48:40 -06:00
Nicolas Delaby
14b367e8ce transmit socket parameter for inner function calls 2015-03-18 16:45:02 -06:00
Mike Place
0c6b3e58ec Merge pull request #21782 from rallytime/syndic_doc_fix 
Update syndic documentation
 2015-03-18 16:21:08 -06:00
rallytime
f56cdd5489 Update syndic documentation 
Add some docs about installing a minion on the syndic to help reduce the amount of time spent waiting for the CLI to return.
 2015-03-18 16:05:07 -06:00
Mike Place
36841bdd82 Backport #21175 to 2014.7 
Addresses same syndic issues as #21175
 2015-03-18 14:48:03 -06:00
Thomas S Hatch
55a35c809d Merge pull request #21755 from jacksontj/2014.7 
Add timeout to saltnado's event listener
 2015-03-18 11:49:38 -06:00
Nicole Thomas
26689dac8c Merge pull request #21757 from jfindlay/tar_tests 
Tar tests
 2015-03-18 09:39:33 -06:00
Thomas Jackson
a95f81233c Cleanup merge 2015-03-18 08:11:38 -07:00
Thomas Jackson
70155ddd49 Massive speedup to saltnado 
This mixin was creating 3 localclients and 1 runner client per request-- which takes ~6s. Now we build the set of clients once per process

Conflicts:

	salt/runner.py
 2015-03-18 08:09:41 -07:00
Thomas Jackson
234d02b218 Add timeout to saltnado's event listener 
Fixes #21707

The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
 2015-03-18 08:09:41 -07:00
Justin Findlay
5f143ecb60 unit tests for states.archive.extracted tar opts 
Implements tests for #20795.
 2015-03-17 20:40:20 -06:00
Justin Findlay
f2fe1b9ed5 add positional arguments in order within longopts 
Non option arguments, arguments that do not begin with a `-` should
probably be kept in the same order that they were specified in
`tar_options` as they might be arguments to a specific option, like
`--option option_arg`.  Collecting all of these at the end of `tar_cmd`
would break these options.  The gnu tar manpage has this to say about
it:

A long function name must be prefixed with --.  Some options take a
parameter; with the single-letter form these must be given as separate
arguments.

Related to #20795.
 2015-03-17 19:58:06 -06:00
Justin Findlay
53c9d48331 fix typo 2015-03-17 19:58:05 -06:00
Thomas S Hatch
49d972da1a Merge pull request #21743 from jfindlay/eauth_group_test 
add eauth pam group tests
 2015-03-17 17:51:18 -06:00
Justin Findlay
f735f0b96d add eauth pam group tests 
Adds test for #17380.
 2015-03-17 14:25:57 -06:00
jfindlay
44069742d7 Merge pull request #21734 from MrMarvin/fix/issue_19405_debian_ip_interfaces_parsing 
"fixes" bug when parsing interfaces
 2015-03-17 12:50:09 -06:00
Marvin Frick
d8892fd587 fixes PEP8 W601 and E713- thanks linting test 2015-03-17 18:33:48 +01:00
Marvin Frick
f43f8c47df "fixes" bug when parsing interfaces 
On even only somewhat invalid /etc/network/interfaces files the
function broke with an inconprehensible error message.
This MR enhances the error message and removes the invalid
interface from the result.

See github issue #19405
 2015-03-17 17:27:50 +01:00
Thomas S Hatch
493a97c276 Merge pull request #21701 from rvstaveren/fix_ldap_group_handling_2014_7 
Fix ldap group handling for 2014.7
 2015-03-16 17:30:44 -06:00
jfindlay
2e5cdb17cb Merge pull request #21711 from rallytime/bp-21676 
Backport #21676 to 2014.7
 2015-03-16 16:00:51 -06:00
jfindlay
0225463933 Merge pull request #21708 from rallytime/bp-21666 
Backport #21666 to 2014.7
 2015-03-16 15:48:52 -06:00
Ruben van Staveren
6e510935c6 username doesn't necessarily need to be in slot 0 
check for existence in whole array instead
 2015-03-16 21:55:53 +01:00
Aneesh Agrawal
01f90d5c8b Add error messages when missing setting_name param. 
Prevent empty error message of 'Passed invalid arguments:' when running
git.config_get or git.config_set without passing the setting_name
parameter by including error message in TypeError - make it clear that
the parameter is not invalid but missing.

These should be the only two such 'raw' TypeErrors across all current salt modules.
 2015-03-16 14:55:02 -06:00
Alexander Schwartz
5f11f7b74c added tests to ensure commands are created accordingly (without additional single quotes) 2015-03-16 14:49:09 -06:00
Alexander Schwartz
5f48e5580c separate command from arguments to avoid problems when adding quotes 2015-03-16 14:49:09 -06:00
Thomas S Hatch
8a12fbbce8 Merge pull request #21630 from UtahDave/fix_syndic 
WORK IN PROGRESS - Fix syndic
 2015-03-16 14:26:31 -06:00
Thomas S Hatch
0fc61de0e2 Merge pull request #21677 from aneeshusa/check-http-response-status-2014.7 
Check response status when using fileclient.get_url.
 2015-03-16 12:35:46 -06:00
Aneesh Agrawal
58a1afc832 Check response status when using fileclient.get_url. 
Fix for 2014.7 for Issue #21625.

Only works for 2014.7; will follow up with more PRs for newer versions,
where there is no a strict dependency on requests and we need to
duplicate the functionality when using urllib2.
 2015-03-15 16:53:47 -04:00
jfindlay
27674094f6 Merge pull request #21658 from rvstaveren/fix_eauth_in_batch_2014_7 
enable eauth during cli batch operations
 2015-03-15 12:54:20 -06:00
Ruben van Staveren
58eacc0ae5 Merge branch 'fix_eauth_in_batch_2014_7' of https://github.com/rvstaveren/salt into fix_eauth_in_batch_2014_7 2015-03-14 12:37:31 +01:00
Ruben van Staveren
3939799942 enable eauth during cli batch operations 2015-03-14 12:36:53 +01:00
Ruben van Staveren
237d85dd77 enable eauth during cli batch operations 2015-03-14 00:09:52 +01:00
Thomas S Hatch
dd130a7eb1 Merge pull request #21648 from tjstansell/fix-rh_ip-stp 
fix #21628: support STP option in rh_ip to enable/disable spanning tree
 2015-03-13 16:29:16 -06:00
Thomas S Hatch
a8e8cb9593 Merge pull request #21636 from basepi/salt-ssh.msgpack.gate.21226 
Gate salt.utils.cloud (imports msgpack) in config.py for salt-ssh
 2015-03-13 16:28:14 -06:00
Thomas S Hatch
52e390184b Merge pull request #21626 from rallytime/bp-21622 
Backport #21622 to 2014.7
 2015-03-13 16:26:40 -06:00
Joseph Hall
1b6e14c49a Merge pull request #21645 from rallytime/set_password_linode 
Set the vm_ password before calling salt.utils.bootstrap
 2015-03-13 15:16:07 -06:00
Todd Stansell
317f627295 fix #21628: brctl accepts either "on" or "yes" to enable STP, otherwise it 
disables it, so using the existing loop to force the value to either "yes" or "no".
 2015-03-13 14:14:48 -07:00
rallytime
843a7eef49 Set the vm_ password before calling salt.utils.bootstrap 2015-03-13 14:56:00 -06:00
jfindlay
34073600e7 Merge pull request #21637 from highlyunavailable/increase_boto_route53_timeout 
Increase the timeout of boto route53 module
 2015-03-13 14:15:11 -06:00
Tiru Srikantha
2a7c563b07 Increase the timeout of boto route53 application 
When using `wait_for_insync` the boto route53 module doesn't wait long
enough. The default timeout is 10 retries of 10 seconds, but in actual
use it takes 13 tries to wait for insync.

This change ups the default timeout to 300 seconds (30 retries at 10
second sleeps each) to wait for insync to happen.
 2015-03-13 11:17:37 -07:00
Colton Myers
3ef09d3765 Gate salt.utils.cloud (imports msgpack) in config.py for salt-ssh 
Fixes #21226
 2015-03-13 12:03:09 -06:00