x
/
vmware-nsx
Code Issues Proposed changes

Make NSX plugins independent of devstack:lib/neutron-legacy 

This patch copies those constants defined in devstack:lib/neutron-legacy
and currently used in NSX plugins to each plugin-specific init script.
Thus each plugin can still run once neutron-legacy is deprecated.

Change-Id: Id9c964e57c4060392873594faceb27ab59bbe3a7
This commit is contained in:
Shih-Hao Li 2016-06-09 15:15:09 -07:00 committed by garyk
parent 48c86ee9d3
commit be3f069c1d
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/vmware_dvs
View File

@ -19,6 +19,11 @@
# Neutron VMware DVS plugin
# -------------------------
# Settings previously defined in devstack:lib/neutron-legacy
NEUTRON_CONF_DIR=/etc/neutron
export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
# Save trace setting
DVS_XTRACE=$(set +o | grep xtrace)
set +o xtrace

6
devstack/lib/vmware_nsx
View File

@ -20,6 +20,12 @@
# Neutron VMware NSX plugin
# -------------------------
# Settings previously defined in devstack:lib/neutron-legacy
NEUTRON_CONF_DIR=/etc/neutron
export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}
# Save trace setting
NSX_XTRACE=$(set +o | grep xtrace)
set +o xtrace

5
devstack/lib/vmware_nsx_v3
View File

@ -20,7 +20,10 @@
# Neutron VMware NSX plugin
# -------------------------
# Settings
# Settings previously defined in devstack:lib/neutron-legacy
NEUTRON_CONF_DIR=/etc/neutron
export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
# The interface which has connectivity to the NSX Gateway uplink
NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-}