From 1398583e07aab24ceebaa084a6f2878e4b3b278d Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Wed, 5 Feb 2020 13:20:55 +0100 Subject: [PATCH] ovn: Update bridge configuration code After power user feedback we want to change how interfaces are attached to bridges on the OVN charms. Ref: openstack-charmers/charm-layer-ovn#6 --- zaza/openstack/utilities/openstack.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py index 7e48a98..2c27b7d 100644 --- a/zaza/openstack/utilities/openstack.py +++ b/zaza/openstack/utilities/openstack.py @@ -672,7 +672,7 @@ def configure_gateway_ext_port(novaclient, neutronclient, net_id=None, except KeyError: # ovn-dedicated-chassis not in deployment pass - port_config_key = 'interface-bridge-mappings' + port_config_key = 'bridge-interface-mappings' config.update({'ovn-bridge-mappings': 'physnet1:br-ex'}) add_dataport_to_netplan = True else: @@ -713,8 +713,6 @@ def configure_gateway_ext_port(novaclient, neutronclient, net_id=None, if 'ext-port' in port['name']: if deprecated_extnet_mode: ext_br_macs.append(port['mac_address']) - elif ovn_present(): - ext_br_macs.append('{}:br-ex'.format(port['mac_address'])) else: ext_br_macs.append('br-ex:{}'.format(port['mac_address'])) ext_br_macs.sort()