From b29535c9812e70ba299bab67c0bc60606dce054d Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 13 Jun 2014 12:17:42 -0500 Subject: [PATCH] Perform safe normalization of nics to use uuid --- cloud/rax_scaling_group | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cloud/rax_scaling_group b/cloud/rax_scaling_group index 84ebfb2756f..818c6089c89 100644 --- a/cloud/rax_scaling_group +++ b/cloud/rax_scaling_group @@ -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 = []