From 314487b98fffcc913ad32680dd016352da5dbbb2 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Wed, 7 Apr 2021 15:08:34 +0300 Subject: [PATCH] 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 5104fdf58941f57b00beb05a8d3253b6b3a6e0d7) --- tripleo_common/image/kolla_builder.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tripleo_common/image/kolla_builder.py b/tripleo_common/image/kolla_builder.py index 736d822b0..c8407ed61 100644 --- a/tripleo_common/image/kolla_builder.py +++ b/tripleo_common/image/kolla_builder.py @@ -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,