From 6ca850c5fa254e3c2bf600865e3db5e7e85bdb83 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@hp.com>
Date: Sat, 30 Aug 2014 14:04:11 +0100
Subject: [PATCH] Fix DevStack xtrace output

This ensures xtrace is correctly restored, allowing us to see the commands
executed during, for example, exercise runs.

Change-Id: I49434ae752a6c214892634a3dfa9f24b814ebd59
---
 contrib/devstack/lib/designate_plugins/backend-bind9    | 4 ++--
 contrib/devstack/lib/designate_plugins/backend-fake     | 4 ++--
 contrib/devstack/lib/designate_plugins/backend-ipa      | 4 ++--
 contrib/devstack/lib/designate_plugins/backend-powerdns | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/devstack/lib/designate_plugins/backend-bind9 b/contrib/devstack/lib/designate_plugins/backend-bind9
index f75d6198..8acb0400 100644
--- a/contrib/devstack/lib/designate_plugins/backend-bind9
+++ b/contrib/devstack/lib/designate_plugins/backend-bind9
@@ -16,7 +16,7 @@
 # cleanup_designate_backend - remove transient data and cache
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+DP_BIND9_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 # Defaults
@@ -144,4 +144,4 @@ function cleanup_designate_backend {
 }
 
 # Restore xtrace
-$XTRACE
+$DP_BIND9_XTRACE
diff --git a/contrib/devstack/lib/designate_plugins/backend-fake b/contrib/devstack/lib/designate_plugins/backend-fake
index 795c388b..938f9e57 100644
--- a/contrib/devstack/lib/designate_plugins/backend-fake
+++ b/contrib/devstack/lib/designate_plugins/backend-fake
@@ -16,7 +16,7 @@
 # cleanup_designate_backend - remove transient data and cache
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+DP_FAKE_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 # Defaults
@@ -56,4 +56,4 @@ function cleanup_designate_backend {
 }
 
 # Restore xtrace
-$XTRACE
+$DP_FAKE_XTRACE
diff --git a/contrib/devstack/lib/designate_plugins/backend-ipa b/contrib/devstack/lib/designate_plugins/backend-ipa
index 8d322245..f741b141 100644
--- a/contrib/devstack/lib/designate_plugins/backend-ipa
+++ b/contrib/devstack/lib/designate_plugins/backend-ipa
@@ -16,7 +16,7 @@
 # cleanup_designate_backend - remove transient data and cache
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+DP_IPA_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 # Defaults
@@ -75,4 +75,4 @@ function cleanup_designate_backend {
 }
 
 # Restore xtrace
-$XTRACE
+$DP_IPA_XTRACE
diff --git a/contrib/devstack/lib/designate_plugins/backend-powerdns b/contrib/devstack/lib/designate_plugins/backend-powerdns
index 4bd699cb..aff8c997 100644
--- a/contrib/devstack/lib/designate_plugins/backend-powerdns
+++ b/contrib/devstack/lib/designate_plugins/backend-powerdns
@@ -16,7 +16,7 @@
 # cleanup_designate_backend - remove transient data and cache
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+DP_PDNS_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 # Defaults
@@ -109,4 +109,4 @@ function cleanup_designate_backend {
 }
 
 # Restore xtrace
-$XTRACE
+$DP_PDNS_XTRACE