x/whitebox-neutron-tempest-plugin
Code Issues Proposed changes

Merge "Use the value of "ml2_plugin_config" when retrieving the ML2 conf file"

Browse Source
This commit is contained in:
Zuul 2024-09-13 15:11:45 +00:00 committed by Gerrit Code Review
commit 2c618d8d11
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
whitebox_neutron_tempest_plugin/common/utils.py
View File

@ -304,9 +304,13 @@ def get_neutron_api_service_name():
def get_ml2_conf_file(): def get_ml2_conf_file():
"""Neutron ML2 config file name depending on the installation type""" """Neutron ML2 config file name depending on the installation type
The default value of WB_CONF.ml2_plugin_config is
'/etc/neutron/plugins/ml2/ml2_conf.ini'.
"""
if WB_CONF.openstack_type in ('podified', 'devstack'): if WB_CONF.openstack_type in ('podified', 'devstack'):
return '/etc/neutron/plugins/ml2/ml2_conf.ini' return WB_CONF.ml2_plugin_config
else: else:
return ('/var/lib/config-data/puppet-generated/neutron' return ('/var/lib/config-data/puppet-generated/neutron' +
'/etc/neutron/plugins/ml2/ml2_conf.ini') WB_CONF.ml2_plugin_config)