openstack/devstack
Code Issues Proposed changes

Handle nested xtrace states (Quantum edition)

Browse Source 
The lib/quantum_* directories include plugin files that also
contains the $XTRACE bits at entry and exit.  The nested XTRACE handling overwrote
the value from lib/quantum.  So...make the nested files use their own
XTRACE variables.

Change-Id: Ib5e643371666b21402eef2ec58bfb1dfb7e1ccc4
This commit is contained in:
Dean Troyer 2013-02-07 17:16:35 -06:00
parent f127e2f316
commit 8d55be31a9
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/quantum_plugins/bigswitch_floodlight
View File

@ -2,7 +2,7 @@
# ------------------------------------ # ------------------------------------
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
source $TOP_DIR/lib/quantum_plugins/ovs_base source $TOP_DIR/lib/quantum_plugins/ovs_base
@ -52,4 +52,4 @@ function quantum_plugin_setup_interface_driver() {
} }
# Restore xtrace # Restore xtrace
$XTRACE $MY_XTRACE

4
lib/quantum_plugins/linuxbridge
View File

@ -2,7 +2,7 @@
# --------------------------- # ---------------------------
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
function is_quantum_ovs_base_plugin() { function is_quantum_ovs_base_plugin() {
@ -76,4 +76,4 @@ function quantum_plugin_setup_interface_driver() {
} }
# Restore xtrace # Restore xtrace
$XTRACE $MY_XTRACE

4
lib/quantum_plugins/openvswitch
View File

@ -2,7 +2,7 @@
# --------------------------- # ---------------------------
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
source $TOP_DIR/lib/quantum_plugins/ovs_base source $TOP_DIR/lib/quantum_plugins/ovs_base
@ -141,4 +141,4 @@ function quantum_plugin_setup_interface_driver() {
} }
# Restore xtrace # Restore xtrace
$XTRACE $MY_XTRACE

4
lib/quantum_plugins/ovs_base
View File

@ -2,7 +2,7 @@
# ------------------------------------- # -------------------------------------
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
function is_quantum_ovs_base_plugin() { function is_quantum_ovs_base_plugin() {
@ -46,4 +46,4 @@ function _quantum_ovs_base_configure_l3_agent() {
} }
# Restore xtrace # Restore xtrace
$XTRACE $MY_XTRACE

4
lib/quantum_plugins/ryu
View File

@ -2,7 +2,7 @@
# ------------------ # ------------------
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
source $TOP_DIR/lib/quantum_plugins/ovs_base source $TOP_DIR/lib/quantum_plugins/ovs_base
@ -60,4 +60,4 @@ function quantum_plugin_setup_interface_driver() {
} }
# Restore xtrace # Restore xtrace
$XTRACE $MY_XTRACE

4
lib/quantum_thirdparty/bigswitch_floodlight vendored
View File

@ -2,7 +2,7 @@
# ------------------------------------------ # ------------------------------------------
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80} BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
@ -47,4 +47,4 @@ function stop_bigswitch_floodlight() {
} }
# Restore xtrace # Restore xtrace
$XTRACE $MY_XTRACE

4
lib/quantum_thirdparty/ryu vendored
View File

@ -2,7 +2,7 @@
# ----------------------- # -----------------------
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
@ -62,4 +62,4 @@ function stop_ryu() {
} }
# Restore xtrace # Restore xtrace
$XTRACE $MY_XTRACE