Damian Myerscough
9b3b7eb518
check to see if a partition exists
2014-03-11 18:18:43 -07: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
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
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
Joseph Hall
4d53b498d5
Prevent endless recursion from external pillars
2014-03-11 14:45:05 -06:00
Joseph Hall
68cce928ee
Merge pull request #11142 from gtmanfred/image_meta_data
...
[Nova] I cant type, flavor, not flvaor
2014-03-11 14:33:22 -06:00
Daniel Wallace
45fd1bdfaa
[Nova] I cant type, flavor, not flvaor
2014-03-11 15:30:35 -05:00
Joseph Hall
66325423fd
Merge pull request #11141 from CaptTofu/develop
...
Removed internal nomenclature for regions
2014-03-11 14:13:25 -06:00
CaptTofu
e2573d376a
Removed internal nomenclature for regions
2014-03-11 15:59:32 -04:00
Joseph Hall
f46a1292f8
Merge pull request #11140 from gtmanfred/image_meta_data
...
[Nova] apply _id to SaltNova too
2014-03-11 13:51:29 -06:00
Daniel Wallace
d34a2267db
[Nova] apply _id to SaltNova too
2014-03-11 14:49:25 -05:00
Thomas S Hatch
bae3cf69eb
Merge pull request #11127 from makinacorpus/cronfix2
...
cron: fix tests
2014-03-11 12:34:24 -07:00
Joseph Hall
9ac2f5699f
Merge pull request #11139 from gtmanfred/image_meta_data
...
Image meta data
2014-03-11 13:25:20 -06:00
Daniel Wallace
44eeae46e6
[Nova] unify _ids in nova module
2014-03-11 14:22:22 -05:00
Daniel Wallace
1a79cc8c42
[Nova] fix image_meta_delete
...
I apparently can't type and had put in image_meta_data instead of the
correct function when moving to SaltNova.
2014-03-11 14:17:01 -05:00
Thomas S Hatch
a1c0b60b15
Merge pull request #11136 from cvrebert/patch-2
...
fix typo: salt.config.{minion_conf=>minion_config}
2014-03-11 12:12:59 -07:00
Thomas S Hatch
6f9465faa7
Merge pull request #11134 from cvrebert/patch-1
...
cloud/clouds/lxc.py: fix typo in comment
2014-03-11 12:12:46 -07:00
Thomas S Hatch
204b76eb93
Merge pull request #11126 from cachedout/ssh_work
...
Ssh work
2014-03-11 12:09:48 -07:00
Thomas S Hatch
bdc303a2dd
Merge pull request #11124 from CaptTofu/develop
...
Added document for use of salt-cloud with HP Cloud 1.1
2014-03-11 12:09:12 -07:00
Chris Rebert
c2723d5906
fix typo: salt.config.{minion_conf=>minion_config}
...
************* Module salt.cloud.clouds.lxc
salt/cloud/clouds/lxc.py:70: [E1101(no-member), _minion_opts] Module 'salt.config' has no 'minion_conf' member
2014-03-11 12:07:47 -07:00
Chris Rebert
9f85e8c29d
cloud/clouds/lxc.py: fix typo in comment
2014-03-11 11:54:58 -07:00
Joseph Hall
c272d3900e
Merge pull request #11132 from hulu/clouds-nova
...
Avoid shadowing outer `client` name in salt.cloud.clouds.nova.destroy()
2014-03-11 12:40:24 -06:00
Joseph Hall
84b8077bee
Merge pull request #11131 from hulu/utils-event-typos
...
fix various typos in salt/utils/event.py
2014-03-11 12:39:07 -06:00
Chris Rebert
324eb85ed6
Avoid shadowing outer client name in salt.cloud.clouds.nova.destroy()
...
************* Module salt.cloud.clouds.nova
salt/cloud/clouds/nova.py:355: [W0621(redefined-outer-name), destroy] Redefining name 'client' from outer scope (line 111)
2014-03-11 11:38:00 -07:00
Joseph Hall
5fa8be176e
Merge pull request #11123 from gtmanfred/image-show
...
[Nova] allow building from hidden images
2014-03-11 12:37:32 -06:00
Chris Rebert
f0ad7b0567
fix various typos in salt/utils/event.py
2014-03-11 11:32:07 -07:00
Mathieu Le Marec - Pasquet
66e98055c9
cron: fix tests
2014-03-11 18:13:06 +00:00
Mike Place
cdd5d86bbf
Clarify where the Salt SSH configuration comes from.
2014-03-11 11:59:07 -06:00
Adrien "ze" Urban
ec314d4ef6
file.blockreplace(append_if_not_empty): test for missing \n at EOF
2014-03-11 18:46:01 +01:00
Mike Place
8fbead772e
Fix broken shell script.
2014-03-11 11:37:35 -06:00
CaptTofu
1516808ee7
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2014-03-11 13:20:19 -04:00
CaptTofu
e6f51e4e5b
Added HP Cloud documentation
2014-03-11 10:18:28 -07:00
Daniel Wallace
2b5e4c272a
[Nova] allow building from hidden images
2014-03-11 12:17:34 -05:00
Thomas S Hatch
5cc01d1e5f
whitespace
2014-03-11 10:10:55 -06:00
Thomas S Hatch
5676968524
Merge pull request #11120 from makinacorpus/cronfix
...
cron: Fix for #10959
2014-03-11 09:02:21 -07:00
Thomas S Hatch
249f8c05bc
Merge pull request #11116 from jasonrm/module-brew-upgrade
...
brew: Add pkg.upgrade support
2014-03-11 09:00:08 -07:00
Thomas S Hatch
0c07a4b3d6
Merge pull request #11115 from jasonrm/module-brew-pkglist
...
brew: Use salt.utils.version_cmp to determine latest package version installed.
2014-03-11 08:59:39 -07:00
Thomas S Hatch
cedcbfe76a
Merge pull request #11110 from amco/add-rbenv-install-as-state
...
Add rbenv.install_rbenv as separate state
2014-03-11 08:58:47 -07:00
Thomas S Hatch
b02204d84d
Merge pull request #11029 from whiteinge/event-runner
...
Add event function to state runner for light event interaction via CLI
2014-03-11 08:51:56 -07:00
Thomas S Hatch
84d5c525b0
Merge pull request #10972 from s0undt3ch/hotfix/force-virtual-booleans
...
The `__virtual__()` function should only return strings on renames.
2014-03-11 08:51:11 -07:00
Joseph Hall
5e68ede61c
Merge pull request #11113 from gtmanfred/cloud
...
clean up the volume_delete and volume_detach cloud states
2014-03-11 08:28:22 -06:00
Daniel Wallace
80413734a7
Clean up pylint
2014-03-11 09:15:42 -05:00
Daniel Wallace
96dd716104
clean up nova volume_delete and volume_detach
2014-03-11 08:35:47 -05:00
Daniel Wallace
d6a4dc3d4e
Add apikey support for novaclient
...
You are required to specify the auth_system to use apikeys since
keystone doesn't support them by default.
2014-03-11 08:35:47 -05:00
Daniel Wallace
c4ada79552
add volume_delete and volume_detach states
2014-03-11 08:35:47 -05:00
Pedro Algarvio
c21b99609d
Merge pull request #11117 from fsniper/develop
...
Fix for #10656 : __env__ should be passed around instead of env
2014-03-11 12:12:25 +00:00
