Skip to content

Commit

Permalink
Merge pull request #26869 from rallytime/lxc-cloud-fix
Browse files Browse the repository at this point in the history
Fix provider --> driver change for salt-cloud lxc
  • Loading branch information
basepi committed Sep 3, 2015
2 parents a21b3f4 + d62f971 commit e92fdd8
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion salt/cloud/clouds/lxc.py
Expand Up @@ -427,11 +427,16 @@ def create(vm_, call=None):
'lxc_profile',
vm_.get('container_profile', None))

# 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', 'starting create',
'salt/cloud/{0}/creating'.format(vm_['name']),
{'name': vm_['name'], 'profile': profile,
'provider': vm_['provider'], },
'provider': vm_['driver'], },
transport=__opts__['transport'])
ret = {'name': vm_['name'], 'changes': {}, 'result': True, 'comment': ''}
if 'pub_key' not in vm_ and 'priv_key' not in vm_:
Expand Down

0 comments on commit e92fdd8

Please sign in to comment.