diff --git a/from-grizzly/upgrade-cinder b/from-grizzly/upgrade-cinder
index 5b6b65ed..2cbc3e88 100755
--- a/from-grizzly/upgrade-cinder
+++ b/from-grizzly/upgrade-cinder
@@ -6,7 +6,9 @@
 function configure_cinder_upgrade(){
     # Print the commands being run so that we can see the command that triggers
     # an error.  It is also useful for following allowing as the install occurs.
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
+
     CINDER_POLICY_JSON=$CINDER_CONF_DIR/policy.json
 
     # add rules needed for live volume migration
@@ -39,5 +41,6 @@ catalog.RegionOne.volumev2.name = Volume Service V2
 " >> $KEYSTONE_CATALOG
         start_keystone
     fi
-    set +o xtrace
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-grizzly/upgrade-devstack b/from-grizzly/upgrade-devstack
index 1dd64d8a..ecf48813 100755
--- a/from-grizzly/upgrade-devstack
+++ b/from-grizzly/upgrade-devstack
@@ -3,7 +3,9 @@
 # ``upgrade-devstack``
 
 function configure_devstack_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-grizzly/upgrade-glance b/from-grizzly/upgrade-glance
index ab10c09b..dbeba636 100755
--- a/from-grizzly/upgrade-glance
+++ b/from-grizzly/upgrade-glance
@@ -4,6 +4,7 @@
 
 # configure_glance
 function configure_glance_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
 
     # guarantee we have all rules set in the new release
@@ -12,5 +13,6 @@ function configure_glance_upgrade(){
         cp -p $GLANCE_DIR/etc/schema-image.json $GLANCE_SCHEMA_JSON
     fi
 
-    set +o xtrace
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-grizzly/upgrade-keystone b/from-grizzly/upgrade-keystone
index 1bb39fcd..a3ffdd75 100755
--- a/from-grizzly/upgrade-keystone
+++ b/from-grizzly/upgrade-keystone
@@ -3,9 +3,9 @@
 # ``upgrade-keystone``
 
 configure_keystone_upgrade(){
-    # configure_keystone
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+    # reset to previous state
+    $XTRACE
 }
-
diff --git a/from-grizzly/upgrade-oslo b/from-grizzly/upgrade-oslo
index d90f358a..b802734f 100755
--- a/from-grizzly/upgrade-oslo
+++ b/from-grizzly/upgrade-oslo
@@ -3,7 +3,9 @@
 # ``upgrade-oslo``
 
 function configure_oslo_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-grizzly/upgrade-swift b/from-grizzly/upgrade-swift
index fb0da9cc..04a73243 100755
--- a/from-grizzly/upgrade-swift
+++ b/from-grizzly/upgrade-swift
@@ -5,7 +5,9 @@
 function configure_swift_upgrade(){
     # Print the commands being run so that we can see the command that triggers
     # an error.  It is also useful for following allowing as the install occurs.
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-grizzly/upgrade-tempest b/from-grizzly/upgrade-tempest
index b6df19ec..481adf88 100755
--- a/from-grizzly/upgrade-tempest
+++ b/from-grizzly/upgrade-tempest
@@ -3,7 +3,10 @@
 # ``upgrade-tempest``
 
 function configure_tempest_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-havana/upgrade-cinder b/from-havana/upgrade-cinder
index 325285bf..8cea35d5 100755
--- a/from-havana/upgrade-cinder
+++ b/from-havana/upgrade-cinder
@@ -3,8 +3,10 @@
 # ``upgrade-cinder``
 
 function configure_cinder_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # upgrade rootwrap configs
     configure_cinder_rootwrap
-    set +o xtrace
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-havana/upgrade-devstack b/from-havana/upgrade-devstack
index 1dd64d8a..111ba72f 100755
--- a/from-havana/upgrade-devstack
+++ b/from-havana/upgrade-devstack
@@ -3,7 +3,8 @@
 # ``upgrade-devstack``
 
 function configure_devstack_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+    $XTRACE
 }
diff --git a/from-havana/upgrade-glance b/from-havana/upgrade-glance
index 6fae3fe7..0305ce74 100755
--- a/from-havana/upgrade-glance
+++ b/from-havana/upgrade-glance
@@ -3,7 +3,8 @@
 # ``upgrade-glance``
 
 function configure_glance_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here
-    set +o xtrace
+    $XTRACE
 }
diff --git a/from-havana/upgrade-horizon b/from-havana/upgrade-horizon
index 6b310c8c..a4678d6c 100755
--- a/from-havana/upgrade-horizon
+++ b/from-havana/upgrade-horizon
@@ -3,8 +3,10 @@
 # ``upgrade-horizon``
 
 configure_horizon_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
-}
 
+    # reset to previous state
+    $XTRACE
+}
diff --git a/from-havana/upgrade-keystone b/from-havana/upgrade-keystone
index a298b848..52678d8d 100755
--- a/from-havana/upgrade-keystone
+++ b/from-havana/upgrade-keystone
@@ -3,8 +3,11 @@
 # ``upgrade-keystone``
 
 configure_keystone_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
-    # nothing to see here yet
-    set +o xtrace
-}
 
+    # nothing to see here yet
+
+    # reset to previous state
+    $XTRACE
+}
diff --git a/from-havana/upgrade-nova b/from-havana/upgrade-nova
index cbaa60d1..68f21a0a 100755
--- a/from-havana/upgrade-nova
+++ b/from-havana/upgrade-nova
@@ -3,8 +3,11 @@
 # ``upgrade-nova``
 
 function configure_nova_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # upgrade rootwrap configs
     configure_nova_rootwrap
-    set +o xtrace
+
+   # reset to previous state
+    $XTRACE
 }
diff --git a/from-havana/upgrade-oslo b/from-havana/upgrade-oslo
index d90f358a..7fea7b14 100755
--- a/from-havana/upgrade-oslo
+++ b/from-havana/upgrade-oslo
@@ -3,7 +3,10 @@
 # ``upgrade-oslo``
 
 function configure_oslo_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-havana/upgrade-swift b/from-havana/upgrade-swift
index a4e088ed..62ef507d 100755
--- a/from-havana/upgrade-swift
+++ b/from-havana/upgrade-swift
@@ -3,7 +3,10 @@
 # ``upgrade-swift``
 
 function configure_swift_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+
+    # reset to previous state
+    $XTRACE
 }
diff --git a/from-havana/upgrade-tempest b/from-havana/upgrade-tempest
index b6df19ec..481adf88 100755
--- a/from-havana/upgrade-tempest
+++ b/from-havana/upgrade-tempest
@@ -3,7 +3,10 @@
 # ``upgrade-tempest``
 
 function configure_tempest_upgrade(){
+    XTRACE=$(set +o | grep xtrace)
     set -o xtrace
     # nothing to see here yet
-    set +o xtrace
+
+    # reset to previous state
+    $XTRACE
 }