From c9b8eba4e43c52d21c32eec6608fe7b70ba4c8d1 Mon Sep 17 00:00:00 2001
From: Kobi Samoray <ksamoray@vmware.com>
Date: Wed, 10 Jan 2018 15:20:08 +0200
Subject: [PATCH] NSXv, DVS: Use neutron DB name instead of neutron_nsx
No sense in changing the DB name, really.
Change-Id: I7f20f4ae9c724791bd3f025a664e9cf92902c938
---
devstack/lib/vmware_dvs | 1 -
devstack/lib/vmware_nsx_v | 1 -
2 files changed, 2 deletions(-)
diff --git a/devstack/lib/vmware_dvs b/devstack/lib/vmware_dvs
index 6ff19b6677..50ca04b0d3 100644
--- a/devstack/lib/vmware_dvs
+++ b/devstack/lib/vmware_dvs
@@ -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"
}
diff --git a/devstack/lib/vmware_nsx_v b/devstack/lib/vmware_nsx_v
index ea90c2c349..6335ad14fe 100644
--- a/devstack/lib/vmware_nsx_v
+++ b/devstack/lib/vmware_nsx_v
@@ -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"
}