From 6d7c7cb00ac7592f96c99843361bb1238096bc31 Mon Sep 17 00:00:00 2001
From: Chris Dent <chdent@redhat.com>
Date: Thu, 16 Jul 2015 12:49:13 +0000
Subject: [PATCH] Store and restore the xtrace option in devstack plugin

Otherwise we might upset the xtrace setting in other files.

Change-Id: I93e7654fb67f455d3cbedb1e6cd010651d8d67dd
---
 devstack/plugin.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b7b16c61..b7e4ab6f 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -38,6 +38,10 @@
 #   CEILOMETER_COORDINATION_URL:   URL for group membership service provided by tooz.
 #   CEILOMETER_EVENTS:             Set to True to enable event collection
 
+# Save trace setting
+XTRACE=$(set +o | grep xtrace)
+set -o xtrace
+
 # Support potential entry-points console scripts in VENV or not
 if [[ ${USE_VENV} = True ]]; then
     PROJECT_VENV["ceilometer"]=${CEILOMETER_DIR}.venv
@@ -412,3 +416,6 @@ if is_service_enabled ceilometer; then
         cleanup_ceilometer
     fi
 fi
+
+# Restore xtrace
+$XTRACE