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
36,110 Commits 24 Branches 182 Tags 341 MiB
e7c493aac6
Commit Graph

36110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
e7c493aac6 Merge pull request #16689 from thatch45/rand-thin-fix 
Rand thin fix
 2014-10-16 16:32:19 -06:00
Thomas S Hatch
e2e901eb09 Fix rand_thin_dir 2014-10-16 15:46:23 -06:00
Thomas S Hatch
512407c2c5 don't create a local tmp dir on the caller 2014-10-16 13:58:36 -06:00
Thomas S Hatch
39193abffc Merge pull request #16686 from terminalmage/pkgrepo-fixes 
Fix pkgrepo state failures
 2014-10-16 13:52:47 -06:00
Thomas S Hatch
8a414d5328 set the wipe param based on what the sending command is 2014-10-16 13:15:49 -06:00
Thomas S Hatch
b6dd239b23 better error message 2014-10-16 12:41:19 -06:00
Thomas S Hatch
b1d1455d78 give better errors as to why the shim failed to deploy 2014-10-16 12:32:58 -06:00
Thomas S Hatch
4fb8f82eb6 disable minion data cache 2014-10-16 12:29:30 -06:00
Erik Johnson
83d89842b5 Don't catch generic exceptions 
This is no longer necessary since none of the pkg.get_repo functions
throw exceptions for non-error conditions.
 2014-10-16 13:21:30 -05:00
Erik Johnson
a3d62c5aa2 Don't throw exception when get_repo doesn't find repo 
Instead, return an empty dict.
 2014-10-16 13:14:35 -05:00
Erik Johnson
0f18619216 Don't throw exception when get_repo doesn't find repo 
Instead, return an empty dict.
 2014-10-16 13:14:26 -05:00
Erik Johnson
ee7a17f55b Don't throw exception when get_repo doesn't find repo 
Instead, return an empty dict.
 2014-10-16 13:13:52 -05:00
Thomas S Hatch
f299eed430 Merge pull request #16685 from thatch45/mods_fix 
Assignment to mods where it was defaulting to None
 2014-10-16 11:29:06 -06:00
Thomas S Hatch
e67d044726 more type checks 2014-10-16 11:13:52 -06:00
Thomas S Hatch
93e6ec42c8 don't shadow mod_data 2014-10-16 11:10:11 -06:00
Thomas S Hatch
199d40857a Add some safetly to mods 2014-10-16 11:08:39 -06:00
Thomas S Hatch
1f82784cbc Fix #16671 2014-10-16 11:04:57 -06:00
Thomas S Hatch
66e429aaa0 Merge pull request #16635 from terminalmage/aptpkg-fallback-virtual 
Fallback to grep-available for virtual pkg support
 2014-10-15 20:38:20 -06:00
Thomas S Hatch
bdb73c13b4 Merge pull request #16643 from bbinet/docker-restart-policy 
Docker restart policy
 2014-10-15 16:57:45 -06:00
Thomas S Hatch
26ae11b88d Merge branch 'cro-retcode_failure_test' into 2014.7 2014-10-15 16:56:56 -06:00
Thomas S Hatch
1f5da204a9 Fix lint 2014-10-15 16:56:41 -06:00
Thomas S Hatch
906719d691 Merge branch 'retcode_failure_test' of https://github.com/cro/salt into cro-retcode_failure_test 2014-10-15 16:56:12 -06:00
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
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
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
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