From 9641d4987e7961a6175d118bca304d525ca760b0 Mon Sep 17 00:00:00 2001
From: Shih-Hao Li <shihli@vmware.com>
Date: Thu, 10 Sep 2015 11:35:15 -0700
Subject: [PATCH] Update references for vmware plugin config (etc part)

Because vmware plugin config nsx.ini is now moved
from neutron:/etc/neutron/plugins/vmware/ to vmware-nsx:/etc/,
we need to update associated references in setup.cfg.

The new path to nsx.ini is defined in Q_PLUGIN_SRC_CONF_PATH.

This is the first part of vmware plugin decomposition
(etc, extensions, and database).

Partial-bug: #1483453
Depends-On: I3caf25ce91ff425d815f35ed3efd599a572d595b
Change-Id: I326dc1eaf549ac631caf71e9adc3c7a218a7723f
---
 devstack/lib/vmware_dvs    | 3 +++
 devstack/lib/vmware_nsx    | 3 +++
 devstack/lib/vmware_nsx_v  | 3 +++
 devstack/lib/vmware_nsx_v3 | 3 +++
 setup.cfg                  | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/devstack/lib/vmware_dvs b/devstack/lib/vmware_dvs
index 7dae2edd46..08399a046f 100644
--- a/devstack/lib/vmware_dvs
+++ b/devstack/lib/vmware_dvs
@@ -57,6 +57,9 @@ function neutron_plugin_install_agent_packages {
 function neutron_plugin_configure_common {
     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
     Q_PLUGIN_CONF_FILENAME=nsx.ini
+    Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
+    mkdir -p /$Q_PLUGIN_CONF_PATH
+    cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     Q_DB_NAME="neutron_nsx"
     Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugin.NsxDvsPlugin"
 }
diff --git a/devstack/lib/vmware_nsx b/devstack/lib/vmware_nsx
index f62b4f30f0..7988cae49c 100644
--- a/devstack/lib/vmware_nsx
+++ b/devstack/lib/vmware_nsx
@@ -59,6 +59,9 @@ function neutron_plugin_install_agent_packages {
 function neutron_plugin_configure_common {
     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
     Q_PLUGIN_CONF_FILENAME=nsx.ini
+    Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
+    mkdir -p /$Q_PLUGIN_CONF_PATH
+    cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     Q_PLUGIN_CLASS="neutron.plugins.vmware.plugin.NsxPlugin"
 }
 
diff --git a/devstack/lib/vmware_nsx_v b/devstack/lib/vmware_nsx_v
index 3cab01b2b9..6c7ee0b8d8 100644
--- a/devstack/lib/vmware_nsx_v
+++ b/devstack/lib/vmware_nsx_v
@@ -49,6 +49,9 @@ function neutron_plugin_install_agent_packages {
 function neutron_plugin_configure_common {
     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
     Q_PLUGIN_CONF_FILENAME=nsx.ini
+    Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
+    mkdir -p /$Q_PLUGIN_CONF_PATH
+    cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     Q_DB_NAME="neutron_nsx"
     Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugin.NsxVPlugin"
 }
diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index db83a04861..3e7d127b6d 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -59,6 +59,9 @@ function neutron_plugin_install_agent_packages {
 function neutron_plugin_configure_common {
     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
     Q_PLUGIN_CONF_FILENAME=nsx.ini
+    Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
+    mkdir -p /$Q_PLUGIN_CONF_PATH
+    cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugins.nsx_v3_plugin.NsxV3Plugin"
 }
 
diff --git a/setup.cfg b/setup.cfg
index 9b238bd39f..2d20e25e0c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,9 @@ classifier =
 [files]
 packages =
     vmware_nsx
+data_files =
+    etc/neutron/plugins/vmware = etc/nsx.ini
+
 [entry_points]
 console_scripts =
     neutron-check-nsx-config = vmware_nsx.neutron.plugins.vmware.check_nsx_config:main