Merge pull request #27953 from The-Loeki/patch-1

Fix CloudStack cloud for new 'driver' syntax
This commit is contained in:
Mike Place 2015-10-15 06:38:57 -06:00
commit c50802a80f

View file

@ -242,6 +242,11 @@ def create(vm_):
return False
except AttributeError:
pass
# Since using "provider: <provider-engine>" is deprecated, alias provider
# to use driver: "driver: <provider-engine>"
if 'provider' in vm_:
vm_['driver'] = vm_.pop('provider')
salt.utils.cloud.fire_event(
'event',
@ -250,7 +255,7 @@ def create(vm_):
{
'name': vm_['name'],
'profile': vm_['profile'],
'provider': vm_['provider'],
'provider': vm_['driver'],
},
transport=__opts__['transport']
)
@ -383,7 +388,7 @@ def create(vm_):
{
'name': vm_['name'],
'profile': vm_['profile'],
'provider': vm_['provider'],
'provider': vm_['driver'],
},
transport=__opts__['transport']
)