Merge "heat stack-update assumes interfaces have fixed ip addresses"

6 years ago · 7930886f07
parent 558aed6c6d 7cfd38d5be
commit 7930886f07
1 changed files with 4 additions and 1 deletions
--- a/heat/engine/resources/openstack/nova/server_network_mixin.py
+++ b/heat/engine/resources/openstack/nova/server_network_mixin.py
@ -313,9 +313,12 @@ class ServerNetworkMixin(object):

        for iface in interfaces:
            # get interface properties
+            ipaddr = None
+            if len(iface.fixed_ips) > 0:
+                ipaddr = iface.fixed_ips[0]['ip_address']
            props = {'port': iface.port_id,
                     'net_id': iface.net_id,
-                     'ip': iface.fixed_ips[0]['ip_address'],
+                     'ip': ipaddr,
                     'nets': nets}
            # try to match by port or network_id with fixed_ip
            net = find_equal(**props)