Merge "NSXv, DVS: Use neutron DB name instead of neutron_nsx"

This commit is contained in:
Zuul 2018-01-12 13:28:41 +00:00 committed by Gerrit Code Review
commit 1b4c6e7a10
2 changed files with 0 additions and 2 deletions

@ -69,7 +69,6 @@ function neutron_plugin_configure_common {
(cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh)
mkdir -p /$Q_PLUGIN_CONF_PATH
cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
Q_DB_NAME="neutron_nsx"
Q_PLUGIN_CLASS="vmware_dvs"
}

@ -59,7 +59,6 @@ function neutron_plugin_configure_common {
cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR/policy.d
cp -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d/* $NEUTRON_CONF_DIR/policy.d/
Q_DB_NAME="neutron_nsx"
Q_PLUGIN_CLASS="vmware_nsxv"
}