x/vmware-nsx
Code Issues Proposed changes

Update references for vmware plugin config (etc part)

Browse Source 
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
This commit is contained in:
Shih-Hao Li 2015-09-10 11:35:15 -07:00
parent 7bb63f2f8b
commit 9641d4987e
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/vmware_dvs
View File

@ -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"
}

3
devstack/lib/vmware_nsx
View File

@ -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"
}

3
devstack/lib/vmware_nsx_v
View File

@ -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"
}

3
devstack/lib/vmware_nsx_v3
View File

@ -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"
}

3
setup.cfg
View File

@ -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