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

Merge pull request #26869 from rallytime/lxc-cloud-fix

Browse Source 
Fix provider --> driver change for salt-cloud lxc
This commit is contained in:
Colton Myers 2015-09-02 18:06:25 -06:00
commit e92fdd871d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/cloud/clouds/lxc.py
View File

@ -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_: