openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Fix neutron driver detection for containers params" into stable/victoria

This commit is contained in:
Zuul 2021-04-22 05:15:36 +00:00 committed by Gerrit Code Review
parent c0fec3865e 1b2f0a55a9
commit 023271220d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tripleo_common/image/kolla_builder.py
View File

@ -115,15 +115,17 @@ def set_neutron_driver(pd, mapping_args):
:param pd: Parameter defaults from the environment :param pd: Parameter defaults from the environment
:param mapping_args: Dict to set neutron_driver value on :param mapping_args: Dict to set neutron_driver value on
""" """
if mapping_args.get('neutron_driver'):
return
if not pd or 'NeutronMechanismDrivers' not in pd: if not pd or 'NeutronMechanismDrivers' not in pd:
# we should set default neutron driver # we should set default neutron driver
mapping_args['neutron_driver'] = 'ovn' mapping_args['neutron_driver'] = 'ovn'
return
nmd = pd['NeutronMechanismDrivers']
if 'ovn' in nmd:
mapping_args['neutron_driver'] = 'ovn'
else: else:
mapping_args['neutron_driver'] = 'other' nmd = pd['NeutronMechanismDrivers']
if 'ovn' in nmd:
mapping_args['neutron_driver'] = 'ovn'
else:
mapping_args['neutron_driver'] = 'other'
def container_images_prepare_multi(environment, roles_data, dry_run=False, def container_images_prepare_multi(environment, roles_data, dry_run=False,