valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,562 Commits 24 Branches 182 Tags 341 MiB
cf14ef20d5
Commit Graph

38562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
494527a442 Merge pull request #16659 from etuttle/s3fs-dirs 
Properly discover directories in s3fs file server.  Fixes #16638.
 2014-10-15 16:53:13 -06:00
Thomas S Hatch
aa9c896d42 Merge pull request #16648 from makinacorpus/f2 
Proper handling of watch with onlyif/unless
 2014-10-15 16:11:23 -06:00
Thomas S Hatch
99e42f5788 Merge pull request #16662 from rallytime/bp-16648 
Backport #16648 to 2014.7
 2014-10-15 16:10:57 -06:00
Thomas S Hatch
4b9178c1b8 Merge pull request #16652 from cachedout/issue_16504 
Load __salt__ into wrappers for salt-ssh
 2014-10-15 16:06:04 -06:00
Thomas S Hatch
03b2b4955c Merge pull request #16661 from thatch45/fix_rand_thin 
Fix rand_thin dir system, it was broken in the heredoc PR
 2014-10-15 15:35:44 -06:00
Ethan Tuttle
bbae532c01 Properly discover directories in s3fs file server. Fixes #16638. 
Also, remove the dirs_only parameter to _find_files in pillar s3,
because it doesn't work in some cases and isn't used anyway.
 2014-10-15 14:27:28 -07:00
Mathieu Le Marec - Pasquet
b837be080c Proper handling of watch with onlyif/unless 
This fixes #16647
 2014-10-15 15:11:04 -06:00
Thomas S Hatch
3b981dac7b Fix rand_thin dir system, it was broken in the heredoc PR 2014-10-15 14:49:52 -06:00
Thomas S Hatch
623a11d067 Merge pull request #16653 from thatch45/heredoc 
Fix #16645
 2014-10-15 13:26:16 -06:00
Mike Place
6d8173d262 Adding TODO 2014-10-15 12:12:46 -06:00
Thomas S Hatch
3f9e40266b Fix #16645 2014-10-15 12:06:54 -06:00
Mike Place
c01cb59a84 Load __salt__ into wrappers for salt-ssh 
Courage is not simply one of the virtues, but the form of every virtue
at the testing point.
- C. S. Lewis
 2014-10-15 11:48:40 -06:00
Colton Myers
36966afa70 Merge pull request #16649 from basepi/ping_on 
ping_on_rotate, not ping_on_key_rotate
 2014-10-15 09:26:01 -07:00
Colton Myers
e1a2708164 The actual config option is ping_on_rotate 2014-10-15 09:24:15 -07:00
Seth House
1271feccca Merge pull request #16636 from rallytime/netapi_test 
Add minions_denied to netapi test
 2014-10-15 11:05:35 -05:00
Mathieu Le Marec - Pasquet
ea72196c84 Proper handling of watch with onlyif/unless 
This fixes #16647
 2014-10-15 17:56:06 +02:00
Gareth J. Greenaway
f603bc1f4d Ability to detech fusefs devices in the mount state and ensure the provided device matches what is returned by the active mounts. Also including the reconnect & delay_connect mount option which is a valid option for sshfs but will not show up in the list of mounted file systems. 2014-10-15 08:23:47 -07:00
Bruno Binet
6437258797 add support for restart policy in docker.running state 
restart policies have been introduced in docker 1.2.0
https://docs.docker.com/v1.2/#release-notes
 2014-10-15 16:56:02 +02:00
Bruno Binet
1282bac512 add support for restart policy in docker.start module 
restart policies have been introduced in docker 1.2.0
https://docs.docker.com/v1.2/#release-notes
 2014-10-15 16:55:22 +02:00
Pedro Algarvio
cc4d877d5f Merge pull request #16641 from thatch45/rand_thin 
Allows for the use or random thin dirs, fix #16308
 2014-10-15 13:15:27 +01:00
mattmb
0184d8be79 Fix chown in salt cloud provisioning 2014-10-15 12:16:47 +01:00
Thomas S Hatch
aaf53e1c3f Merge branch '2014.7' into rand_thin 
Conflicts:
	salt/client/ssh/__init__.py
 2014-10-15 01:30:03 -06:00
Thomas S Hatch
d44dc2272a Merge pull request #16640 from thatch45/send_ext_mods 
Send ext mods better
 2014-10-15 01:14:39 -06:00
Thomas S Hatch
6db0906e17 Fix error when there are no ext_mods to deploy 2014-10-15 00:49:38 -06:00
Thomas S Hatch
8bad687994 don't pass in bad mods 2014-10-15 00:36:54 -06:00
Thomas S Hatch
cafd6a4b67 remove unused import 2014-10-15 00:09:06 -06:00
Thomas S Hatch
c4924f727b Merge branch '2014.7' into send_ext_mods 
Conflicts:
	salt/client/ssh/__init__.py
 2014-10-14 23:59:45 -06:00
Thomas S Hatch
c7ff3fed45 Allows for the use or randome thin dirs, fix #16308 2014-10-14 23:54:47 -06:00
Thomas S Hatch
177ed820e6 Merge pull request #16637 from thatch45/ooband_ext 
Add -w --wipe option to salt-ssh to clear the deploy when done
 2014-10-14 23:34:12 -06:00
Thomas S Hatch
cb81f6a5fd deploy ext_mods to the right place 2014-10-14 23:24:23 -06:00
Thomas S Hatch
686a96fb3f Fix versioning in ext_mods and add formatting to ext_mods wrapped calls 2014-10-14 23:23:31 -06:00
Thomas S Hatch
7ca73f1453 correctluy condition the return data from ext_mods wraped calls 2014-10-14 23:04:25 -06:00
Thomas S Hatch
7694bc37d7 add deploy_ext method 2014-10-14 22:46:49 -06:00
Thomas S Hatch
01508512bf add ext_mods tarball seq to system 2014-10-14 22:41:35 -06:00
Thomas S Hatch
71cfd3821b initial work on creation of ext_mods tarfile 2014-10-14 22:24:42 -06:00
Thomas S Hatch
fc890492e7 modify shim to recive tarball ext_mods 2014-10-14 21:33:22 -06:00
Thomas S Hatch
436210424f remove stdin hook for ext_mods 2014-10-14 21:09:41 -06:00
Thomas S Hatch
c15231d9c0 Need to use subprocess if wipeing 2014-10-14 20:52:08 -06:00
Thomas S Hatch
fe97b0a51d Add -w --wipe option to salt-ssh to clear the deploy when done 2014-10-14 20:26:40 -06:00
Seth House
fc28d00056 Added SaltConf15 banner and links to sidebar 2014-10-14 19:44:36 -05:00
Erik Johnson
8b05330d07 Fail with meaningful error message if python-apt isn't installed 
This catches the CommandExecutionError raised when python-apt isn't
available and displays the error message as the comment in the return
data for the state.
 2014-10-14 19:11:54 -05:00
Erik Johnson
c5f174718d Reduce duplicated code 2014-10-14 19:10:19 -05:00
rallytime
96a1288808 Add minions_denied to netapi test 2014-10-14 16:49:07 -06:00
Erik Johnson
06402b6086 Fallback to grep-available for virtual pkg support 2014-10-14 17:05:17 -05:00
Ryan Lane
edc5438a1c Add policies_from_pillars to example 2014-10-14 13:09:36 -07:00
Mike Place
1caeee8cae Even more linting 2014-10-14 14:06:12 -06:00
Ryan Lane
9d66f6f365 Add a policies_from_pillars argument to boto_iam_role.present 2014-10-14 13:06:05 -07:00
Thomas S Hatch
9e1843be6d Merge pull request #16446 from cachedout/issue_15673 
Greedy/non-greedy minion matching
 2014-10-14 14:04:53 -06:00
Mike Place
8d2014b1df Last lint hopefully :] 2014-10-14 13:45:35 -06:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00