Merge "Fix neutron driver detection for containers params" into stable/victoria
This commit is contained in:
commit
023271220d
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue