openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Fix default_route_network - default to ctlplane"

This commit is contained in:
Zuul 2021-06-10 17:30:20 +00:00 committed by Gerrit Code Review
parent 8d408f48da 9ba5d72151
commit d88945b0e9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_ports.py
View File

@ -276,7 +276,8 @@ def update_ports(result, conn, port_defs, inst_ports, tags, net_maps,
def create_ports(result, conn, port_defs, inst_ports, tags, net_maps, def create_ports(result, conn, port_defs, inst_ports, tags, net_maps,
network_config): network_config):
default_route_network = network_config.get('default_route_network', []) default_route_network = network_config.get('default_route_network',
['ctlplane'])
ports = conn.network.create_ports(port_defs) ports = conn.network.create_ports(port_defs)
for port in ports: for port in ports:
@ -503,10 +504,7 @@ def _tag_metalsmith_instance_ports(result, conn, provisioner, uuid, hostname,
nic_tags = set(nic.tags) nic_tags = set(nic.tags)
net_name = net_maps['by_id'][nic.network_id] net_name = net_maps['by_id'][nic.network_id]
# If default route network is not set, default to true for ctlplane if net_name in default_route_network:
if not default_route_network and net_name == 'ctlplane':
tags.update({'tripleo_default_route=true'})
elif net_name in default_route_network:
tags.update({'tripleo_default_route=true'}) tags.update({'tripleo_default_route=true'})
if not tags.issubset(nic_tags): if not tags.issubset(nic_tags):
@ -539,7 +537,8 @@ def tag_metalsmith_managed_ports(result, conn, concurrency, stack,
for hostname, uuid in uuid_by_hostname.items(): for hostname, uuid in uuid_by_hostname.items():
role = hostname_role_map[hostname] role = hostname_role_map[hostname]
default_route_network = instances_by_hostname[hostname].get( default_route_network = instances_by_hostname[hostname].get(
'network_config', {}).get('default_route_network', []) 'network_config', {}).get(
'default_route_network', ['ctlplane'])
tags = {'tripleo_stack_name={}'.format(stack), tags = {'tripleo_stack_name={}'.format(stack),
'tripleo_ironic_uuid={}'.format(uuid), 'tripleo_ironic_uuid={}'.format(uuid),