openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Standalone - ovn_bridge_mac comma_delimited_list" into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2022-06-30 22:09:37 +00:00 committed by Gerrit Code Review
commit 9f21032a8c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleoclient/v1/tripleo_deploy.py
View File

@ -690,6 +690,9 @@ class Deploy(command.Command):
# unless user provided an override. # unless user provided an override.
bridge_mappings = user_params.get('NeutronBridgeMappings', bridge_mappings = user_params.get('NeutronBridgeMappings',
['datacentre:br-ex']) ['datacentre:br-ex'])
# Handle heat comma_delimited_list
if isinstance(bridge_mappings, str) and bridge_mappings:
bridge_mappings = bridge_mappings.split(',')
physnets = [bridge.split(':')[0] for bridge in bridge_mappings] physnets = [bridge.split(':')[0] for bridge in bridge_mappings]
for idx, physnet in enumerate(physnets): for idx, physnet in enumerate(physnets):
ovn_bridge_macs[physnet] = 'fa:16:3a:00:53:{:02X}'.format(idx) ovn_bridge_macs[physnet] = 'fa:16:3a:00:53:{:02X}'.format(idx)