Merge "Handle nested xtrace states (Quantum edition)"
This commit is contained in:
commit
7520623f74
@ -2,7 +2,7 @@
|
||||
# ------------------------------------
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
MY_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
source $TOP_DIR/lib/quantum_plugins/ovs_base
|
||||
@ -52,4 +52,4 @@ function quantum_plugin_setup_interface_driver() {
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
$MY_XTRACE
|
||||
|
@ -2,7 +2,7 @@
|
||||
# ---------------------------
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
MY_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
function is_quantum_ovs_base_plugin() {
|
||||
@ -76,4 +76,4 @@ function quantum_plugin_setup_interface_driver() {
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
$MY_XTRACE
|
||||
|
@ -2,7 +2,7 @@
|
||||
# ---------------------------
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
MY_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
source $TOP_DIR/lib/quantum_plugins/ovs_base
|
||||
@ -141,4 +141,4 @@ function quantum_plugin_setup_interface_driver() {
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
$MY_XTRACE
|
||||
|
@ -2,7 +2,7 @@
|
||||
# -------------------------------------
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
MY_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
function is_quantum_ovs_base_plugin() {
|
||||
@ -46,4 +46,4 @@ function _quantum_ovs_base_configure_l3_agent() {
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
$MY_XTRACE
|
||||
|
@ -2,7 +2,7 @@
|
||||
# ------------------
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
MY_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
source $TOP_DIR/lib/quantum_plugins/ovs_base
|
||||
@ -60,4 +60,4 @@ function quantum_plugin_setup_interface_driver() {
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
$MY_XTRACE
|
||||
|
4
lib/quantum_thirdparty/bigswitch_floodlight
vendored
4
lib/quantum_thirdparty/bigswitch_floodlight
vendored
@ -2,7 +2,7 @@
|
||||
# ------------------------------------------
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
MY_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
|
||||
@ -47,4 +47,4 @@ function stop_bigswitch_floodlight() {
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
$MY_XTRACE
|
||||
|
4
lib/quantum_thirdparty/ryu
vendored
4
lib/quantum_thirdparty/ryu
vendored
@ -2,7 +2,7 @@
|
||||
# -----------------------
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
MY_XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
|
||||
@ -62,4 +62,4 @@ function stop_ryu() {
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
$MY_XTRACE
|
||||
|
Loading…
Reference in New Issue
Block a user