openstack/heat
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-02-10 05:41:04 +00:00 committed by Gerrit Code Review
commit 7930886f07
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/openstack/nova/server_network_mixin.py
View File

@ -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)