Merge pull request #7755 from sivel/rax-asg-normalize-nic

module rax_scaling_group: safe normalization of nics
reviewable/pr18780/r1
James Cammarata 11 years ago
commit d604bb6dc6

@ -215,8 +215,12 @@ def rax_asg(module, cooldown=300, disk_config=None, files={}, flavor=None,
nics.extend(cnw.get_server_networks(network))
for nic in nics:
nic.update(uuid=nic['net-id'])
del nic['net-id']
# pyrax is currently returning net-id, but we need uuid
# this check makes this forward compatible for a time when
# pyrax uses uuid instead
if nic.get('net-id'):
nic.update(uuid=nic['net-id'])
del nic['net-id']
# Handle the file contents
personality = []

Loading…
Cancel
Save