@@ -51,6 +51,7 @@ source $TOP_DIR/lib/swift

 source $TOP_DIR/lib/heat

 source $TOP_DIR/lib/neutron-legacy

+set -o xtrace

 # Extras Source

 # --------------

@@ -23,7 +23,6 @@

 # Print the commands being run so that we can see the command that triggers

 # an error.  It is also useful for following along as the install occurs.

 set -o xtrace

-export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'

 # Make sure custom grep options don't get in the way

 unset GREP_OPTIONS

@@ -14,6 +14,9 @@ unset LANGUAGE

 LC_ALL=C

 export LC_ALL

+# Make tracing more educational

+export PS4='+ ${BASH_SOURCE}:${FUNCNAME[0]}:L${LINENO}:   '

+

 # Find the other rc files

 RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)

@@ -87,6 +87,8 @@ load_plugin_settings

 # ``os_RELEASE``, ``os_UPDATE``, ``os_PACKAGE``, ``os_CODENAME``

 GetOSVersion

+set -o xtrace

+

 # Run extras

 # ==========