arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #171 from openstack-charmers/ovn-charm

Browse Source 
ovn: Update bridge configuration code
This commit is contained in:
Chris MacNaughton
2020-02-05 16:32:19 +01:00
committed by GitHub
parent cb15b18afc 1398583e07
commit 6d38fcaafb
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zaza/openstack/utilities/openstack.py
View File

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