Commit Graph

27600 Commits

Author SHA1 Message Date
Thomas S Hatch
7b0338279b Make the salt-key cli system modular for raet keys 2014-03-13 00:31:21 -06:00
Thomas S Hatch
95c9a113ec Use the salt specific udp behavior 2014-03-13 00:06:50 -06:00
Thomas S Hatch
5db27d0e8e Extend verify_env to cover raet key dirs if raet is enabled 2014-03-13 00:00:03 -06:00
Thomas S Hatch
8a52f87fcd Revert "Reuse Channels"
This reverts commit ae9b62c27f.
2014-03-12 23:50:36 -06:00
Thomas S Hatch
ecdd43fe85 track on estate name, not estate object 2014-03-12 23:46:50 -06:00
Thomas S Hatch
e9d05b7b1b Correctly re-routepublish results from the local cmds 2014-03-12 23:38:15 -06:00
Thomas S Hatch
2c7cbbc0c3 get is a function! 2014-03-12 23:12:59 -06:00
Thomas S Hatch
6a9d237446 kill spurious print 2014-03-12 23:04:31 -06:00
Thomas S Hatch
18cbc7e0ff Add a safe 2014-03-12 22:49:57 -06:00
Thomas S Hatch
334a79ea6d msgpack for events 2014-03-12 22:42:21 -06:00
Thomas S Hatch
8fbdaef28e Set everythign to use msgpack 2014-03-12 22:18:36 -06:00
Thomas S Hatch
ec401a8b1f Add salt specific udp stack behavior 2014-03-12 22:18:36 -06:00
Thomas S Hatch
2a79b489fe Register workers with the router 2014-03-12 22:18:36 -06:00
Thomas S Hatch
fa72900d86 Merge pull request #10332 from jacksontj/channelreuse
Reuse Channels
2014-03-12 21:38:50 -06:00
Pedro Algarvio
bd2b5eb502 Merge pull request #11191 from s0undt3ch/develop
Revert "Revert "Fix #11003 TypeError: can only concatenate list (not "Im...
2014-03-13 01:22:26 +00:00
Pedro Algarvio
4e86550069 Revert "Revert "Fix #11003 TypeError: can only concatenate list (not "ImmutableLazyProxy(list)") to list""
This reverts commit 58ac70b85f.
2014-03-13 01:21:04 +00:00
David Boucha
86bbb0a382 Merge pull request #11187 from terminalmage/issue10541
Fix regression in chocolatey.bootstrap
2014-03-12 17:44:20 -06:00
Samuel Smith
e1ba5ae01d Merge pull request #11188 from SmithSamuelM/sam_raet_21
Sam raet 21 Added preliminary support for salt.key.RaetKey in Udp Stack
2014-03-12 17:00:38 -06:00
Samuel M Smith
d6c833d5af Merge remote-tracking branch 'upstream/develop' into sam_raet_21 2014-03-12 16:55:31 -06:00
Samuel M Smith
fc6cb4de2e Added support for the salt.key.RaetKey in Raet Udp stack 2014-03-12 16:53:16 -06:00
Thomas S Hatch
ed7b3a2713 avoid stack trace with explicit yard name 2014-03-12 16:50:50 -06:00
Erik Johnson
e2b3e93071 Fix regression in chocolatey.bootstrap 2014-03-12 17:50:04 -05:00
Thomas S Hatch
5dc8be72b9 Merge pull request #11186 from cachedout/11185
Link directly to bootstrap README.
2014-03-12 16:27:58 -06:00
Thomas S Hatch
073b1d9a9c switch to local client factory function 2014-03-12 16:26:30 -06:00
Mike Place
ec7dec55f7 Link directly to bootstrap README. 2014-03-12 16:04:45 -06:00
Thomas S Hatch
f7cd160e9f Merge pull request #11184 from cachedout/11094
Fix localclient
2014-03-12 15:52:07 -06:00
Thomas S Hatch
51e4449c57 Merge pull request #11182 from terminalmage/state-single-mod-init
Call mod_init when invoking state.single
2014-03-12 15:51:46 -06:00
Thomas S Hatch
3ccff2cfbf Pull depreaction warning until it is cleaned up
Once the deprecated modules are cleaned up we can uncomment this
2014-03-12 15:49:50 -06:00
Thomas S Hatch
9e2f595051 Not in ioflo land yet.... 2014-03-12 15:40:55 -06:00
Thomas S Hatch
3493df2cb5 Only generate the access keys once in the master before
spining up workers
2014-03-12 15:32:06 -06:00
Joseph Hall
a76e202003 Merge pull request #11183 from allanparsons/develop
Update aws.rst
2014-03-12 14:47:34 -06:00
Thomas S Hatch
5d61815bd2 Match up initiate packets 2014-03-12 14:44:13 -06:00
Mike Place
1b63103aff Fix localclient
We weren't passing in tgt_type to get_iter_returns. This was breaking
batch mode for highstates and probably a bunch of other things.
2014-03-12 14:36:34 -06:00
Allan Parsons
4ba6ec4c87 Update aws.rst
Added additional documentation for VPC, Auto Assign EIP, and tagging instances
2014-03-12 13:32:47 -07:00
Thomas S Hatch
f06f3ccf89 no need for the initial crypted message, it was just a test 2014-03-12 14:00:54 -06:00
Erik Johnson
8f4e3e68b6 Call mod_init when invoking state.single
This ensures that mod_init is run when state.single is invoked.
salt.state.State.call_chunk() is what runs mod_init, but call_chunk() is
not invoked by state.single since requisites do not need to be resolved.

This commit adds a call to salt.state.State._mod_init() just before
salt.state.State.call() is invoked, making sure that the state's
mod_init() function is called like it is in state.sls and
state.highstate.
2014-03-12 14:54:11 -05:00
Thomas S Hatch
f6cc61b2d4 Merge pull request #11176 from terminalmage/11129
Pass through no_start to lxc.{bootstrap,run_cmd}
2014-03-12 13:05:59 -06:00
Samuel M Smith
0fe85dbea8 debugging salt raet key and interface 2014-03-12 12:34:15 -06:00
Thomas S Hatch
32cdf1cdb1 Add index to format strings per 2.6 compat 2014-03-12 11:15:16 -06:00
Erik Johnson
c64de487a0 Fix lint issues
Also some formatting fixes
2014-03-12 12:04:30 -05:00
Thomas S Hatch
327eddad09 Run the setup routine in the minion floscript 2014-03-12 11:04:16 -06:00
Thomas S Hatch
d7e1bb6c54 whitespace 2014-03-12 10:57:33 -06:00
Thomas S Hatch
7272556788 Merge pull request #11174 from vimalloc/patch-4
Don't grab opts/pillar values when there is an explicit default file
2014-03-12 10:56:35 -06:00
Thomas S Hatch
b0a297b9ca Merge pull request #11169 from ticosax/return-status-for-built
modules.dockerio.build was exiting in unknown state
2014-03-12 10:49:11 -06:00
Thomas S Hatch
ef0f3203e3 Add file type 2014-03-12 10:47:30 -06:00
Joseph Hall
1891ba2500 Merge pull request #11177 from cro/salt-cloud-doc-fix
Update salt cloud installation docs.
2014-03-12 10:47:12 -06:00
Thomas S Hatch
4c66a172c1 Merge pull request #11171 from ze42/dev_replace_state
states.file.replace(append/prepend_if_not_found)
2014-03-12 10:46:45 -06:00
Joseph Hall
3fbf00ef66 Merge pull request #11178 from cro/fix_depwarnings
Fix various '__virtual__ not renamed' DeprecationWarnings
2014-03-12 10:46:15 -06:00
Joseph Hall
0ec6122a83 Merge pull request #11172 from Katafalkas/salt-cloud_ec2_describe_snapshots
Improving salt-cloud ec2 describe_snapshots function
2014-03-12 10:43:25 -06:00
Joseph Hall
229efe6a97 Merge pull request #11175 from terminalmage/issue11135
Don't shadow "destroy" method.
2014-03-12 10:38:22 -06:00