@@ -111,7 +111,8 @@ function write_clouds_yaml {

 # Accepts as True: 1 yes Yes YES true True TRUE

 # VAR=$(trueorfalse default-value test-value)

 function trueorfalse {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local default=$1

@@ -169,7 +170,8 @@ function die {

 # die_if_not_set $LINENO env-var "message"

 function die_if_not_set {

     local exitcode=$?

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local line=$1; shift

     local evar=$1; shift

@@ -183,7 +185,8 @@ function die_if_not_set {

 # err $LINENO "message"

 function err {

     local exitcode=$?

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local msg="[ERROR] ${BASH_SOURCE[2]}:$1 $2"

     echo $msg 1>&2;

@@ -200,7 +203,8 @@ function err {

 # err_if_not_set $LINENO env-var "message"

 function err_if_not_set {

     local exitcode=$?

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local line=$1; shift

     local evar=$1; shift

@@ -236,7 +240,8 @@ function is_set {

 # warn $LINENO "message"

 function warn {

     local exitcode=$?

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local msg="[WARNING] ${BASH_SOURCE[2]}:$1 $2"

     echo $msg

@@ -986,7 +991,8 @@ function _get_package_dir {

 # Uses globals ``OFFLINE``, ``*_proxy``

 # apt_get operation package [package ...]

 function apt_get {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     [[ "$OFFLINE" = "True" || -z "$@" ]] && return

@@ -1055,7 +1061,8 @@ function _parse_package_files {

 # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection

 #   of the package to the distros listed.  The distro names are case insensitive.

 function get_packages {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local services=$@

     local package_dir=$(_get_package_dir)

@@ -1123,7 +1130,8 @@ function get_packages {

 # The same metadata used in the main DevStack prerequisite files may be used

 # in these prerequisite files, see get_packages() for more info.

 function get_plugin_packages {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local files_to_parse=""

     local package_dir=""

@@ -1148,7 +1156,8 @@ function update_package_repo {

     fi

     if is_ubuntu; then

-        local xtrace=$(set +o | grep xtrace)

+        local xtrace

+    xtrace=$(set +o | grep xtrace)

         set +o xtrace

         if [[ "$REPOS_UPDATED" != "True" || "$RETRY_UPDATE" = "True" ]]; then

             # if there are transient errors pulling the updates, that's fine.

@@ -1854,7 +1863,8 @@ function enable_service {

 # Uses global ``ENABLED_SERVICES``

 # is_service_enabled service [service ...]

 function is_service_enabled {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local enabled=1

     local services=$@

@@ -1933,7 +1943,8 @@ function use_exclusive_service {

 # Only run the command if the target file (the last arg) is not on an

 # NFS filesystem.

 function _safe_permission_operation {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local args=( $@ )

     local last

@@ -17,7 +17,8 @@ set +o xtrace

 # Append a new option in an ini file without replacing the old value

 # iniadd [-sudo] config-file section option value1 value2 value3 ...

 function iniadd {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local sudo=""

     if [ $1 == "-sudo" ]; then

@@ -37,7 +38,8 @@ function iniadd {

 # Comment an option in an INI file

 # inicomment [-sudo] config-file section option

 function inicomment {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local sudo=""

     if [ $1 == "-sudo" ]; then

@@ -55,7 +57,8 @@ function inicomment {

 # Get an option from an INI file

 # iniget config-file section option

 function iniget {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

     local section=$2

@@ -70,7 +73,8 @@ function iniget {

 # Get a multiple line option from an INI file

 # iniget_multiline config-file section option

 function iniget_multiline {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

     local section=$2

@@ -85,7 +89,8 @@ function iniget_multiline {

 # Determinate is the given option present in the INI file

 # ini_has_option config-file section option

 function ini_has_option {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

     local section=$2

@@ -107,7 +112,8 @@ function ini_has_option {

 #

 # iniadd_literal [-sudo] config-file section option value

 function iniadd_literal {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local sudo=""

     if [ $1 == "-sudo" ]; then

@@ -135,7 +141,8 @@ $option = $value

 # Remove an option from an INI file

 # inidelete [-sudo] config-file section option

 function inidelete {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local sudo=""

     if [ $1 == "-sudo" ]; then

@@ -161,7 +168,8 @@ function inidelete {

 # iniset [-sudo] config-file section option value

 #  - if the file does not exist, it is created

 function iniset {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local sudo=""

     if [ $1 == "-sudo" ]; then

@@ -198,7 +206,8 @@ $option = $value

 # Set a multiple line option in an INI file

 # iniset_multiline [-sudo] config-file section option value1 value2 valu3 ...

 function iniset_multiline {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local sudo=""

     if [ $1 == "-sudo" ]; then

@@ -236,7 +245,8 @@ $option = $v

 # Uncomment an option in an INI file

 # iniuncomment config-file section option

 function iniuncomment {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local sudo=""

     if [ $1 == "-sudo" ]; then

@@ -38,7 +38,8 @@ function get_pip_command {

 # Get the path to the direcotry where python executables are installed.

 # get_python_exec_prefix

 function get_python_exec_prefix {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     if [[ -z "$os_PACKAGE" ]]; then

         GetOSVersion

@@ -69,7 +70,8 @@ function pip_install_gr {

 # ``PIP_UPGRADE``, ``TRACK_DEPENDS``, ``*_proxy``,

 # pip_install package [package ...]

 function pip_install {

-    local xtrace=$(set +o | grep xtrace)

+    local xtrace

+    xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local upgrade=""

     local offline=${OFFLINE:-False}