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

should make Name tag only default if the user has not defined it in the cloud configuration file

Browse Source
This commit is contained in:
Paul Bruno 2018-07-23 17:17:10 -04:00
parent 61a74b68a4
commit bd22b9a9ac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/cloud/clouds/ec2.py
View File

@ -2876,12 +2876,14 @@ def create(vm_=None, call=None):
for k, v in six.iteritems(ret['blockDeviceMapping']):
if isinstance(v, dict):
if v['deviceName'] in ex_blockdevicetags:
ex_blockdevicetags[v['deviceName']]['Name'] = vm_['name']
if not 'Name' in ex_blockdevicetags[v['deviceName']]:
ex_blockdevicetags[v['deviceName']]['Name'] = vm_['name']
block_device_volume_id_map[v[ret['rootDeviceType']]['volumeId']] = ex_blockdevicetags[v['deviceName']]
else:
for _d in v:
if _d['deviceName'] in ex_blockdevicetags:
ex_blockdevicetags[_d['deviceName']]['Name'] = vm_['name']
if not 'Name' in ex_blockdevicetags[_d['deviceName']]:
ex_blockdevicetags[_d['deviceName']]['Name'] = vm_['name']
block_device_volume_id_map[_d[ret['rootDeviceType']]['volumeId']] = ex_blockdevicetags[_d['deviceName']]
if block_device_volume_id_map: