diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 1216277daef..fe175314863 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1,12 +1,5 @@ LIBDIR=$DEST/neutron/devstack/lib -if is_neutron_legacy_enabled; then - NEUTRON_CORE_PLUGIN=$Q_PLUGIN - NEUTRON_AGENT=$Q_AGENT - NEUTRON_CORE_PLUGIN_CONF_PATH=$Q_PLUGIN_CONF_PATH - NEUTRON_CORE_PLUGIN_CONF=$Q_PLUGIN_CONF_FILE -fi - source $LIBDIR/dns source $LIBDIR/flavors source $LIBDIR/l2_agent diff --git a/devstack/settings b/devstack/settings index b452f883145..88531f1e4df 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1 +1,10 @@ L2_AGENT_EXTENSIONS=${L2_AGENT_EXTENSIONS:-} + +if is_neutron_legacy_enabled; then + NEUTRON_CORE_PLUGIN=$Q_PLUGIN + NEUTRON_AGENT=$Q_AGENT + # NOTE(ihrachys) those values are defined same way as in + # lib/neutron_plugins/ml2:neutron_plugin_configure_common + NEUTRON_CORE_PLUGIN_CONF_PATH=etc/neutron/plugins/ml2 + NEUTRON_CORE_PLUGIN_CONF=$NEUTRON_CORE_PLUGIN_CONF_PATH/ml2_conf.ini +fi