Commit Graph

36166 Commits

Author SHA1 Message Date
Thomas S Hatch
ac9c3fe479 Merge pull request #16563 from mzdaniel/16271-ssh-SLS-custom-module
Added salt-ssh integration test for custom module within SLS
2014-10-17 17:36:07 -06:00
Daniel Mizyrycki
e421aff68d Fix lint 2014-10-17 15:39:49 -07:00
Daniel Mizyrycki
54738d0ff5 Added salt-ssh integration test for custom module within SLS 2014-10-17 15:39:49 -07:00
Thomas S Hatch
d8bb9488ec Merge pull request #16732 from thatch45/ssh_cache_rm
remove option for now defunct --no-minion-cache
2014-10-17 15:54:51 -06:00
Thomas S Hatch
77fae8821b Merge pull request #16731 from thatch45/mod_agg_prop
Send the state_aggregate option down
2014-10-17 15:53:55 -06:00
Thomas S Hatch
0abcbb437d Merge pull request #16730 from thatch45/wipe_on_rand
Add -W option to --rand-thin-dir making it easier
2014-10-17 15:53:41 -06:00
Thomas S Hatch
13557d3fa2 Merge pull request #16724 from etuttle/gitfs-auth-params
gitfs: accept per-remote auth params (fixes #16698)
2014-10-17 15:52:54 -06:00
Thomas S Hatch
aca65c0bca Merge pull request #16721 from thatch45/16702
Add error checks to highstate per #16702
2014-10-17 15:52:09 -06:00
Thomas S Hatch
87bbf089f4 Merge pull request #16728 from cachedout/issue_16271
Don't refresh in state.pkg
2014-10-17 15:28:20 -06:00
Thomas S Hatch
18e17ac817 remove option for now defunct --no-minion-cache 2014-10-17 15:26:59 -06:00
Thomas S Hatch
84a7d247a5 send down the state_aggregate opts durring state runs 2014-10-17 15:08:12 -06:00
Thomas S Hatch
dcced9a566 pack in the state_aggregate option 2014-10-17 15:05:21 -06:00
Thomas S Hatch
f80a420947 Add -W option to --rand-thin-dir making it easier
Also make the rand-thin-dir wipe up after itself
2014-10-17 14:42:52 -06:00
Mike Place
52d5c886e7 Don't refresh in state.pkg
Fixes #16271
2014-10-17 13:51:52 -06:00
Thomas S Hatch
5a00ba04d2 Merge pull request #16725 from thatch45/ssh_ext_pillar
salt-ssh ext_pillar is a go!
2014-10-17 13:31:56 -06:00
Thomas S Hatch
e0a8bdd425 Pass pillar dirs into compile_pillar 2014-10-17 12:31:07 -06:00
Thomas S Hatch
07652ed0e6 Add raw check for errors in pkg lowstate 2014-10-17 11:34:47 -06:00
Thomas S Hatch
f5ac985c96 check for errors in wrapper highstate compiled state 2014-10-17 11:28:00 -06:00
Thomas S Hatch
f8956fca55 Merge pull request #16716 from rallytime/bp-16613
Backport #16613 to 2014.7
2014-10-17 11:00:24 -06:00
Thomas S Hatch
d18e5c4b29 Merge pull request #16715 from whiteinge/reactor-cmd-local-method
Rename the cmd method in the Reactor to local for consistency
2014-10-17 10:59:16 -06:00
Thomas S Hatch
b4db08e4b9 Merge pull request #16706 from whiteinge/salt-api_gen-keys-download
Added convenience URL to generate minion keys and download as a tarball
2014-10-17 10:57:04 -06:00
Thomas S Hatch
9abe02fad4 Merge pull request #16703 from whiteinge/orchestrate-runner-wheel
Added functions to execute runner and wheel functions from orchestrate
2014-10-17 10:53:23 -06:00
Thomas S Hatch
d8b9aa3335 Merge pull request #16646 from garethgreenaway/16618_2014_7_mount_hash_notation
Fixes to mount state
2014-10-17 10:40:37 -06:00
Thomas S Hatch
f1bebf20da Merge pull request #16521 from cachedout/gen_jid
Add prep_jid to returners
2014-10-17 10:33:38 -06:00
Mike Place
342f356ef3 More lint 2014-10-17 09:40:40 -06:00
Mike Place
4ec8876379 Lint 2014-10-17 09:40:40 -06:00
Mike Place
bf695c413f New onchanges/onfail failure types for requisite resolver
Refs #16370
2014-10-17 09:40:40 -06:00
Seth House
4846dcebbd Update the Reactor docs to use the local method instead of cmd 2014-10-17 09:17:34 -05:00
Seth House
df6921ee26 Rename the cmd method in the Reactor to local for consistency
Also provide a backward-compat alias.
2014-10-17 09:15:26 -05:00
Joseph Hall
3996a999b5 Merge pull request #16700 from whiteinge/json-output-indent
Fix --out-indent for the JSON outputter
2014-10-17 05:44:46 -06:00
Seth House
c91cc43c61 Added missing CLI example 2014-10-17 02:53:16 -05:00
Seth House
9b399d232f Added convenience URL to generate minion keys and download as a tarball
Closes #16597.
2014-10-17 02:42:15 -05:00
Seth House
7f6bf1b1aa Added functions to execute runner and wheel functions from orchestrate 2014-10-16 23:24:47 -05:00
Seth House
70b8eaa2f6 Added documentation about the --out-indent flag 2014-10-16 20:50:44 -05:00
Seth House
23a6000381 Restore negative integer check for --out-indent flag
Fixes #16673.
2014-10-16 20:46:35 -05:00
Seth House
c6cb642f36 Added integration tests for the --out-indent flag for JSON output 2014-10-16 20:46:34 -05:00
Ethan Tuttle
751b582b45 gitfs: accept per-remote auth params (fixes #16698) 2014-10-16 17:13:09 -07:00
Thomas S Hatch
cce7dbd69f Merge pull request #16666 from terminalmage/release-notes-helium
Add new fileserver features to helium release notes
2014-10-16 16:48:08 -06:00
Thomas S Hatch
287ade4714 Merge pull request #16668 from davidjb/2014.7
Fix usage of state.show_sls for salt-ssh
2014-10-16 16:47:05 -06:00
Thomas S Hatch
f66fec8e87 fix issue with sys.doc and salt-ssh 2014-10-16 16:41:15 -06:00
Thomas S Hatch
98b22a2a9b Merge pull request #16690 from cachedout/issue_16658
Allow archive.extracted to be used during highstate run
2014-10-16 16:32:47 -06:00
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
Mike Place
c5c5631ac1 Guh. Wron exception type. Derp. 2014-10-16 15:26:06 -06:00
Mike Place
2b85a8a1dc Missed one try/except 2014-10-16 15:10:18 -06:00
Mike Place
6da5e7343b Catch attribute error if str 2014-10-16 14:58:52 -06:00
Thomas S Hatch
512407c2c5 don't create a local tmp dir on the caller 2014-10-16 13:58:36 -06:00
Mike Place
b518fee488 Allow archive.extracted to be used during highstate run
Use state.single instead.
Use better target cache dir. (Note that this may cause previously cached
files to be re-cached!)
2014-10-16 13:54:56 -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