openstack/neutron-lbaas
Code Issues Proposed changes

Fix the None value of Q_PLUGIN_CONF_FILE if enable neutron-*

Browse Source 
Currently, the devstack installs neutron with 2 ways, one uses
neutron-legacy, the other uses new-neutron-configure way. So they use
different variables. This patch fixes the 'Q_PLUGIN_CONF_FILE' which
from neutron-legacy part.

Change-Id: I303711ba166ece4e6f51b712284c69a0fb342e25
This commit is contained in:
ZhaoBo 2018-06-15 16:43:11 +08:00
parent ce5e47ce96
commit ad3453b90c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -51,7 +51,12 @@ function neutron_lbaas_configure_common {
neutron_deploy_rootwrap_filters $NEUTRON_LBAAS_DIR
$NEUTRON_BIN_DIR/neutron-db-manage --subproject neutron-lbaas --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE upgrade head
# If user enable the Neutron service_name like "q-*",
# the "Q_PLUGIN_CONF_FILE" would be the ml2 config path
# But if user enable the Neutron service name like "neutron-*",
# the same value will be stored into "NEUTRON_CORE_PLUGIN_CONF"
COMPATIBLE_NEUTRON_CORE_PLUGIN_CONF=`[ -n "$Q_PLUGIN_CONF_FILE" ] && echo $Q_PLUGIN_CONF_FILE || echo $NEUTRON_CORE_PLUGIN_CONF`
$NEUTRON_BIN_DIR/neutron-db-manage --subproject neutron-lbaas --config-file $NEUTRON_CONF --config-file /$COMPATIBLE_NEUTRON_CORE_PLUGIN_CONF upgrade head
}
function neutron_lbaas_configure_agent {