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
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
Thomas S Hatch
1c909c0ea9
Merge pull request #11155 from rallytime/mac_user_test
...
Mac user integration test
2014-03-11 23:17:03 -06:00
Thomas S Hatch
5a909c27ad
Add required CLI Example block
2014-03-11 23:13:13 -06:00
Thomas S Hatch
f4db34b64a
Fix exception in yid management
2014-03-11 23:11:51 -06:00
Thomas S Hatch
9973362d8d
gate worker tracker creation
2014-03-11 23:07:22 -06:00
Thomas S Hatch
0b8519c51e
no need to inbound twice
2014-03-11 23:04:19 -06:00
Thomas S Hatch
9e6b2dbeea
Add in the access keys needed by localfuncs
2014-03-11 22:57:33 -06:00
Thomas S Hatch
311dba60f9
more safely connect to the manor yard in raet events
2014-03-11 22:57:33 -06:00
Thomas S Hatch
dc57e8056e
Get workers to start
2014-03-11 22:57:33 -06:00
Thomas S Hatch
89c49c95b7
enter the setup frame before moving to the master udp frame
2014-03-11 22:57:33 -06:00
Joseph Hall
6545cc57dc
Merge pull request #11152 from dmyerscough/develop
...
check to see if existing partitions exist
2014-03-11 22:34:24 -06:00
Thomas S Hatch
6bd0b61d94
remove local cmd, the router sends them to the workers
2014-03-11 22:25:24 -06:00
rallytime
b9ea2d09f4
pylint fixes
2014-03-11 21:45:41 -06:00
Damian Myerscough
f9522dc5c1
PEP8
2014-03-11 18:21:31 -07:00
Damian Myerscough
9b3b7eb518
check to see if a partition exists
2014-03-11 18:18:43 -07:00
C. R. Oldham
b087731d29
Fix various "DeprecationWarning, module not renaming, just have __virtual__ return True" messages
2014-03-11 18:23:42 -06:00
Michal Galet
5e99f1a60b
Fixing formatting in ini_manage_test.py.
2014-03-11 23:41:53 +01:00
Thomas S Hatch
f252a89815
Expose the worker tracker correctly from the datashare
2014-03-11 16:41:43 -06:00
Thomas S Hatch
6b20a969b1
Merge pull request #11145 from terminalmage/issue11050
...
Use --plugins to include plugin-provided repos
2014-03-11 16:35:53 -06:00
Michal Galet
99fcd43135
Fixing ini_manage module to preserve empty options. Added unit test for module to verify there are no regressions.
2014-03-11 23:35:01 +01:00
Thomas S Hatch
433e4b988f
Merge pull request #11146 from ze42/dev_blockreplace
...
file.blockreplace: fix typo endswith
2014-03-11 15:34:07 -06:00
rallytime
edfd0f4a99
Wrote a mac_user integration test
2014-03-11 15:26:16 -06:00
Adrien "ze" Urban
6eba21c787
file.blockreplace: fix typo endswith
2014-03-11 22:09:58 +01:00
Thomas S Hatch
ae91770db2
Merge pull request #11144 from techhat/pillar
...
Prevent endless recursion from external pillars
2014-03-11 14:06:40 -07:00
Thomas S Hatch
112542ca51
Merge pull request #11137 from ze42/dev_blockreplace
...
blockreplace - ensure newline before appending
2014-03-11 14:06:19 -07:00
Erik Johnson
b2efb50ac8
Use --plugins to include plugin-provided repos
...
This adds --plugins to several repoquery calls, allowing results from
plugin-provided repositories to be returned.
2014-03-11 16:05:05 -05:00
