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,027 Commits 24 Branches 182 Tags 341 MiB
06402b6086
Commit Graph

36027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
06402b6086 Fallback to grep-available for virtual pkg support 2014-10-14 17:05:17 -05:00
Mike Place
39845d2cd2 Merge pull request #16612 from saltstack/revert-16611-issue_16370_1 
Revert "New onchanges/onfail failure types for requisite resolver"
 2014-10-13 22:16:21 -06:00
Mike Place
7241e55c40 Revert "New onchanges/onfail failure types for requisite resolver" 2014-10-13 22:15:44 -06:00
Mike Place
9fbf4e66bc Merge pull request #16611 from cachedout/issue_16370_1 
New onchanges/onfail failure types for requisite resolver
 2014-10-13 22:15:37 -06:00
Thomas S Hatch
4b630d77ed Merge pull request #16407 from s0undt3ch/hotfix/cache-loaded-configs 
First attempt at caching the loaded configuration from the filesystem.
 2014-10-13 20:05:52 -06:00
Thomas S Hatch
a750203288 Merge pull request #16608 from lyft/fix-cloud-config-in-boto-asg 
Yaml dump a dict, rather than an odict for boto_asg cloud-config
 2014-10-13 17:40:29 -06:00
Thomas S Hatch
d396a8637a Merge pull request #16609 from jacksontj/2014.7 
Update ACL docs to include @jobs markup
 2014-10-13 17:40:02 -06:00
Thomas S Hatch
b563ae6a3a Merge pull request #16603 from rallytime/bp-16385 
Backport #16385 to 2014.7
 2014-10-13 17:39:39 -06:00
Thomas S Hatch
7891c60f62 Merge pull request #16602 from rallytime/bp-16572 
Backport #16572 to 2014.7
 2014-10-13 17:39:12 -06:00
Thomas S Hatch
e603e18dd4 Merge pull request #16601 from rallytime/bp-16591 
Backport #16591 to 2014.7
 2014-10-13 17:39:07 -06:00
Thomas S Hatch
c8319cff4c Merge pull request #16587 from terminalmage/issue16583 
Don't yamlify args containing only digits and underscores
 2014-10-13 17:38:12 -06:00
Thomas Jackson
e60f47052e Update ACL docs to include @jobs markup 2014-10-13 16:13:23 -07:00
Ryan Lane
6b7a54ea48 Yaml dump a dict, rather than an odict for boto_asg cloud-config 2014-10-13 16:06:48 -07:00
akilesh1597
a8843ff0ba fix ini_manage lint error 2014-10-13 15:42:20 -06:00
akilesh1597
7697eee393 create new file if not already present 2014-10-13 15:41:43 -06:00
Mathieu Le Marec - Pasquet
d1361a1f78 tolerant encoding print in print_cli 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
2d1200b64e pep8 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
acd15e386e display traceback in test error 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
1c4616556a Another fix for outputter reliability 2014-10-13 15:32:10 -06:00
Mathieu Le Marec - Pasquet
287aee9fd1 Better test for output stream existence 2014-10-13 15:32:10 -06:00
Mathieu Le Marec - Pasquet
bc623e8430 Fix encoding issue with collateral damages... 2014-10-13 15:32:10 -06:00
Mathieu Le Marec - Pasquet
9987bb7a97 fix absent key dir 2014-10-13 15:26:46 -06:00
Erik Johnson
7048f9c760 Only skip yamlification if there's actually an underscore 
This fixes test breakage.
 2014-10-13 15:38:40 -05:00
Thomas S Hatch
a44bb73a2f Merge pull request #16596 from rallytime/bp-16501 
Backport #16501 to 2014.7
 2014-10-13 14:32:03 -06:00
Thomas S Hatch
ae3c2529cb Merge pull request #16595 from rallytime/bp-16420 
Backport #16420 to 2014.7
 2014-10-13 14:31:55 -06:00
Thomas S Hatch
bdff493542 Merge pull request #16586 from thatch45/new_args 
Change ext_module passing and make shim interactive to caller
 2014-10-13 14:27:25 -06:00
Thomas S Hatch
399a43d2ac Merge pull request #16580 from s0undt3ch/hotfix/vt-preexec-fn 
[READ CAREFULLY] User switching and umask setting does not belong in VT
 2014-10-13 14:24:51 -06:00
Thomas S Hatch
ef83ad23c3 Merge pull request #16579 from s0undt3ch/hotfix/vt-fixes 
More VT fixes
 2014-10-13 14:23:11 -06:00
Thomas S Hatch
718f778f8e Merge pull request #16594 from thatch45/cachedout-issue_16370 
merge #16561
 2014-10-13 14:20:21 -06:00
Gareth J. Greenaway
1baf90e8f3 Removing log.debug statement 2014-10-13 11:43:03 -06:00
Gareth J. Greenaway
645af2174a Consolidating 4 calls to salt.utils.network.interfaces() into one. Not completely happy with the approach of using a global. 2014-10-13 11:43:03 -06:00
Tomas Neme
7fa1142ff7 Make result=False if retcode is not 0 in module.run/wait 
This fixes commit 57423e031a which
introduced this code, but seems to check the wrong part of `ret`
 2014-10-13 11:29:17 -06:00
Pedro Algarvio
e683619f9f Having data left to read does not mean the process is alive 2014-10-13 17:19:42 +01:00
Thomas S Hatch
ca03400c1c Merge pull request #16568 from s0undt3ch/hotfix/thin-python-eggs 
Fix thin'ing python eggs
 2014-10-13 09:48:27 -06:00
Thomas S Hatch
95f81262ec lint 2014-10-13 09:25:14 -06:00
Thomas S Hatch
4a7db67fe1 Merge branch 'issue_16370' of https://github.com/cachedout/salt into cachedout-issue_16370 2014-10-13 09:21:46 -06:00
Thomas S Hatch
d482247540 Merge pull request #16550 from garethgreenaway/16536_forced_umount_with_test 
Fixes to mount state.
 2014-10-13 09:19:50 -06:00
Thomas S Hatch
dcdd88fcd5 Merge pull request #16548 from cachedout/issue_15133 
Remove expect fork from master upstart script
 2014-10-13 09:18:45 -06:00
Thomas S Hatch
b9db72fc9a Merge pull request #16529 from terminalmage/fix-virtual-grains-aix 
Suppress irrelevant log msg in virtual hardware detection
 2014-10-13 09:16:42 -06:00
Thomas S Hatch
c0333ed7f3 Merge pull request #16500 from UtahDave/2014.7local 
properly fix windows paths for storage on master when using cp.push_dir and cp.push
 2014-10-13 09:08:01 -06:00
Thomas S Hatch
9e879a1d91 lint 2014-10-13 08:44:40 -06:00
Erik Johnson
26deb6aaf5 Don't yamlify args containing only digits and underscores 
Fixes #16583.
 2014-10-13 02:22:27 -05:00
Thomas S Hatch
985ec7c05e IT WORKS!!! 
The shim is no longer passed in as a heredoc because it blocks
stdin. Now the shim python script can be passed into the ssh shell
command and can block! This means that it can prompt the calling
salt-ssh proceess to request extra data. this allows for the
download and update of the ext_mods, but as we move forward it
should allow for the thin deployment to all be in a single command
and not need any scp of sftp, this will also allow us to do bi-derectional
state transactions, maybe even distributing the compile process
which would make salt-ssh even faster
 2014-10-12 23:28:35 -06:00
Joseph Hall
1fdf232c5c Merge pull request #16565 from s0undt3ch/2014.7 
2014.7 fix opts loading in unittests
 2014-10-12 06:30:33 -06:00
Thomas S Hatch
f7e64cbe2f change shim to not take the options from the stdin 
this makes us modify the shim code inline with the options, while
less clean code wish it is cleaner execution wise.
this still doe snot fix the problem though, as the stdin readline still
does not block
 2014-10-12 00:59:34 -06:00
Thomas S Hatch
fdbb24eca6 change EOF string, set readline to stdin 
This still does not work, sys.stdin will not wait to accept anything
because of the way the pipe reads
 2014-10-11 23:44:45 -06:00
Thomas S Hatch
c5857d13a9 don't double send kwargs 2014-10-11 22:36:56 -06:00
Thomas S Hatch
6e79d28ec0 finish initial changes for passing inline ext_mods 
This also introduces using the shim as a flow control interface,
if this works then we may be able to continue to use the shim this
way to send mroe inline data down
 2014-10-11 22:24:02 -06:00
Pedro Algarvio
4470c0dc68 White-space lint fix 2014-10-12 04:29:59 +01:00
Thomas S Hatch
9c5550380c re-send the ext_mods line 2014-10-11 21:22:35 -06:00