diff --git a/whitebox_neutron_tempest_plugin/common/utils.py b/whitebox_neutron_tempest_plugin/common/utils.py index 8dc4d4f..4fa2ec1 100644 --- a/whitebox_neutron_tempest_plugin/common/utils.py +++ b/whitebox_neutron_tempest_plugin/common/utils.py @@ -304,9 +304,13 @@ def get_neutron_api_service_name(): 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'): - return '/etc/neutron/plugins/ml2/ml2_conf.ini' + return WB_CONF.ml2_plugin_config else: - return ('/var/lib/config-data/puppet-generated/neutron' - '/etc/neutron/plugins/ml2/ml2_conf.ini') + return ('/var/lib/config-data/puppet-generated/neutron' + + WB_CONF.ml2_plugin_config)