Merge "Ensure xtrace is enabled in devstack plugin"

devstack/plugin.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 saveenv=$-
-set -e
+set -ex
+
 
 # devstack plugin for octavia
 
@@ -818,3 +819,8 @@ if [[ $saveenv =~ e ]]; then
 else
     set +e
 fi
+if [[ $saveenv =~ x ]]; then
+    set -x
+else
+    set +x
+fi