openstack
/
tripleo-common
Code Issues Proposed changes

Fix neutron driver detection for containers params 

If neutorn driver is set, use it for container parameters.

Close-Bug: rhbz#1930438
Change-Id: If85ca7a92152e834bffb7fad69d71668f7ed362b
(cherry picked from commit 5104fdf589)
This commit is contained in:
Sagi Shnaidman 2021-04-07 15:08:34 +03:00 committed by Shnaidman Sagi
parent 654dc08547
commit 314487b98f
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 mapping_args: Dict to set neutron_driver value on
"""
if mapping_args.get('neutron_driver'):
return
if not pd or 'NeutronMechanismDrivers' not in pd:
# we should set default neutron driver
mapping_args['neutron_driver'] = 'ovn'
return
nmd = pd['NeutronMechanismDrivers']
if 'ovn' in nmd:
mapping_args['neutron_driver'] = 'ovn'
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,