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
CaptTofu
6825c5555c
HP Cloud is now using Havana
2014-03-12 10:12:09 -07:00
CaptTofu
8da0eab5c9
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2014-03-12 10:11:01 -07: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
C. R. Oldham
05bf7cd3b9
Update install docs for salt-cloud to reflect merging into Salt proper.
2014-03-12 10:25:17 -06:00
Erik Johnson
8b3a4e3ae4
Pass through no_start to lxc.{bootstrap,run_cmd}
2014-03-12 11:18:20 -05:00
Erik Johnson
943cb3d1e1
Don't shadow "destroy" method.
...
Fixes #11135 .
2014-03-12 11:10:32 -05:00
Landon
02271f3711
Don't grab opts/pillar values when there is an explicit default file
...
Simple fix for bug #11133 . If a defaults file is *explicitly* passed in at the same time that a mysql.user (etc) exists in opts/pillar, then the opts/pillar user will override the default file instead of the other way around. This change would fix this, but could in theory break things for older version. The ideal solution would be to actually parse the defaults file, but that seems way more error prone.
2014-03-12 10:09:42 -06:00
Audrius Kucinskas
3a802e9ac1
Improving salt-cloud ec2 describe_snapshots function
2014-03-12 18:07:04 +02:00
Thomas S Hatch
1aa991c71f
Merge pull request #11158 from lmzopq/develop
...
Update svn.py
2014-03-12 09:30:50 -06:00
Nicolas Delaby
3a9d273454
comply with returned state interface
...
http://docs.saltstack.com/ref/states/writing.html#return-data
2014-03-12 16:30:37 +01:00
Thomas S Hatch
0a0f4cdd8d
Merge pull request #11149 from ze42/dev_replace
...
file.append(append/prepend_if_not_found)
2014-03-12 09:30:28 -06:00
Thomas S Hatch
0cbfb2e30a
Merge pull request #11148 from galet/ini-missing-rows
...
Fix ini_manage to preserve empty options
2014-03-12 09:29:37 -06:00
Nicolas Delaby
13abde5a67
_ret_status expect only keywords argument
2014-03-12 16:28:39 +01:00
Nicolas Delaby
087a4595d1
rename variable to ease code reading
2014-03-12 16:28:01 +01:00
Damian Myerscough
233b6a16dc
mkpart should only create partitions and mkpartfs should support xfs
2014-03-12 08:27:16 -07:00
Nicolas Delaby
1a7c806b10
was producing redundant information in output
2014-03-12 16:26:39 +01:00
Nicolas Delaby
2ac3ba8d2a
return only once
...
for consistency with the build() function.
2014-03-12 16:26:08 +01:00
Nicolas Delaby
e39ad715d8
don't exit in an unknown state
2014-03-12 16:25:25 +01:00
Adrien "ze" Urban
db04e66a09
states.file.replace(append/prepend_if_not_found)
2014-03-12 16:05:28 +01:00
Nicolas Delaby
3b72b65180
FN_CACHE was not efficient as it was used to replace another dict.
...
And was defeating ``reload_modules: true`` in states.
2014-03-12 14:55:10 +01:00
Mike Place
3c1db17931
Merge pull request #11165 from ranl/develop
...
fixing win_servermanager install/remove function
2014-03-12 06:51:47 -06:00
ranl
e069d55e97
Merge remote-tracking branch 'upstream/develop' into develop
2014-03-12 14:49:29 +02:00
ranl
8f08e2652c
fixing win_servermanager install/remove function
2014-03-12 14:48:49 +02:00
Pedro Algarvio
6708c7eac1
Merge pull request #11159 from StephenPCG/fix-returner-in-batch-mode
...
Pass '--return' settings in batch mode.
2014-03-12 11:05:44 +00:00
Adrien "ze" Urban
68e88db671
file.replace(append_if_not_found) - test units
2014-03-12 10:44:00 +01:00
Adrien "ze" Urban
1af82714e0
file.replace: append/prepend_if_not_found
2014-03-12 09:58:17 +01:00
Zhang Cheng
618fb14158
Pass '--return' settings in batch mode.
2014-03-12 15:17:02 +08:00
Thomas S Hatch
7484308d14
Moved master and minion behaviors to core and normalized them
2014-03-11 23:20:48 -06:00
lmzopq
9571a357d2
Update svn.py
...
export support revision
2014-03-12 13:20:17 +08:00
