do xtrace in include scripts correctly

the included upgrade scripts were turning off xtrace, not
restoring it like we should have been doing. This makes debugging
many of the upgrade issues very difficult.

fix this with the standard xtrace restore.

Change-Id: I922d139b83644a2584c46fecb51b346b05feeec8

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
 }

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
 }

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
 }

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
 }
-

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
 }

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
 }

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
 }

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
 }

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
 }

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
 }

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
+}

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
+}

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
 }

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
 }

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
 }

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
 }