openstack/heat
Code Issues Proposed changes

Merge "Avoid wrongly passing "no_fixed_ips" to Neutron"

Browse Source
This commit is contained in:
Zuul 2024-10-29 17:44:37 +00:00 committed by Gerrit Code Review
commit de2c17447a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,8 @@ class ServerNetworkMixin(object):
# we should add fixed_ips only if subnet or ip were provided # we should add fixed_ips only if subnet or ip were provided
if body: if body:
kwargs.update({'fixed_ips': [body]}) kwargs.update({'fixed_ips': [body]})
if net_data.get(neutron_port.Port.NO_FIXED_IPS):
kwargs.update({'fixed_ips': []})
if security_groups: if security_groups:
sec_uuids = self.client_plugin( sec_uuids = self.client_plugin(
@ -133,6 +135,7 @@ class ServerNetworkMixin(object):
kwargs.update(specs) kwargs.update(specs)
port_extra_keys = list(neutron_port.Port.EXTRA_PROPERTIES) port_extra_keys = list(neutron_port.Port.EXTRA_PROPERTIES)
port_extra_keys.remove(neutron_port.Port.ALLOWED_ADDRESS_PAIRS) port_extra_keys.remove(neutron_port.Port.ALLOWED_ADDRESS_PAIRS)
port_extra_keys.remove(neutron_port.Port.NO_FIXED_IPS)
for key in port_extra_keys: for key in port_extra_keys:
if extra_props.get(key) is not None: if extra_props.get(key) is not None:
kwargs[key] = extra_props.get(key) kwargs[key] = extra_props.get(key)