valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12616 from techhat/cloudrunner

Browse Source 
Fixing passing kwargs in cloud.create runner
This commit is contained in:
Joseph Hall 2014-05-07 19:00:23 -06:00
commit 7f4fb5d96e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/cloud/__init__.py
View File

@ -194,7 +194,9 @@ class CloudClient(object):
opts['show_deploy_args'] = False
opts['script_args'] = ''
# Update it with the passed kwargs
opts.update(kwargs['kwargs'])
if 'kwargs' in kwargs:
opts.update(kwargs['kwargs'])
opts.update(kwargs)
return opts
def low(self, fun, low):

6
salt/runners/cloud.py
View File

@ -133,6 +133,10 @@ def create(provider, names, **kwargs):
image=ami-1624987f size='Micro Instance' ssh_username=ec2-user \
securitygroup=default delvol_on_destroy=True
'''
create_kwargs = {}
for kwarg in kwargs:
if not kwarg.startswith('__'):
create_kwargs[kwarg] = kwargs[kwarg]
client = _get_client()
info = client.create(provider, names, **kwargs)
info = client.create(provider, names, **create_kwargs)
return info