openstack/devstack
Code Issues Proposed changes

Fix Neutron enabled check

Browse Source 
* Remove the check for neutron enabled on a block of variable settings, there
  is no conflict and serves no purpose.
* Also floating_ips.sh and volume.sh needed to properly source lib/neutron
  for do ping_check() to work properly.

The current error in check-devstack-dsvm-neutron is not related to this fix.

Change-Id: I1c458aaa787ffb98c945aefc3afa80c6861a405f
This commit is contained in:
Dean Troyer 2014-02-26 17:35:37 -06:00
parent 1755f689e8
commit e2907b4838
3 changed files with 84 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exercises/floating_ips.sh
View File

@ -27,12 +27,12 @@ TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
# Import common functions # Import common functions
source $TOP_DIR/functions source $TOP_DIR/functions
# Import project functions
source $TOP_DIR/lib/neutron
# Import configuration # Import configuration
source $TOP_DIR/openrc source $TOP_DIR/openrc
# Import project functions
source $TOP_DIR/lib/neutron
# Import exercise configuration # Import exercise configuration
source $TOP_DIR/exerciserc source $TOP_DIR/exerciserc

7
exercises/volumes.sh
View File

@ -27,12 +27,13 @@ TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
# Import common functions # Import common functions
source $TOP_DIR/functions source $TOP_DIR/functions
# Import project functions
source $TOP_DIR/lib/cinder
# Import configuration # Import configuration
source $TOP_DIR/openrc source $TOP_DIR/openrc
# Import project functions
source $TOP_DIR/lib/cinder
source $TOP_DIR/lib/neutron
# Import exercise configuration # Import exercise configuration
source $TOP_DIR/exerciserc source $TOP_DIR/exerciserc

12
lib/neutron
View File

@ -59,10 +59,6 @@
# LinuxBridge plugin, please see the top level README file under the # LinuxBridge plugin, please see the top level README file under the
# Neutron section. # Neutron section.
# Save trace setting
XTRACE=$(set +o | grep xtrace)
set +o xtrace
# Neutron Network Configuration # Neutron Network Configuration
# ----------------------------- # -----------------------------
@ -127,7 +123,7 @@ Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-False}
# See _configure_neutron_common() for details about setting it up # See _configure_neutron_common() for details about setting it up
declare -a Q_PLUGIN_EXTRA_CONF_FILES declare -a Q_PLUGIN_EXTRA_CONF_FILES
if is_service_enabled neutron; then
Q_RR_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf Q_RR_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf
if [[ "$Q_USE_ROOTWRAP" == "False" ]]; then if [[ "$Q_USE_ROOTWRAP" == "False" ]]; then
Q_RR_COMMAND="sudo" Q_RR_COMMAND="sudo"
@ -201,7 +197,6 @@ if is_service_enabled neutron; then
# #
# Example: ``OVS_ENABLE_TUNNELING=True`` # Example: ``OVS_ENABLE_TUNNELING=True``
OVS_ENABLE_TUNNELING=${OVS_ENABLE_TUNNELING:-$ENABLE_TENANT_TUNNELS} OVS_ENABLE_TUNNELING=${OVS_ENABLE_TUNNELING:-$ENABLE_TENANT_TUNNELS}
fi
# Neutron plugin specific functions # Neutron plugin specific functions
# --------------------------------- # ---------------------------------
@ -241,6 +236,11 @@ fi
TEMPEST_SERVICES+=,neutron TEMPEST_SERVICES+=,neutron
# Save trace setting
XTRACE=$(set +o | grep xtrace)
set +o xtrace
# Functions # Functions
# --------- # ---------