x/vmware-nsx
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-06-14 05:20:11 +00:00 committed by Gerrit Code Review
commit 0f441265ea
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 # 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 # Save trace setting
DVS_XTRACE=$(set +o | grep xtrace) DVS_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace

6
devstack/lib/vmware_nsx
View File

@ -20,6 +20,12 @@
# Neutron VMware NSX plugin # 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 # Save trace setting
NSX_XTRACE=$(set +o | grep xtrace) NSX_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace

5
devstack/lib/vmware_nsx_v3
View File

@ -20,7 +20,10 @@
# Neutron VMware NSX plugin # 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 # The interface which has connectivity to the NSX Gateway uplink
NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-} NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-}