@@ -2354,6 +2354,10 @@ function time_stop {

 }

 function oscwrap {

+    local xtrace

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

+    set +o xtrace

+

     local out

     local rc

     local start

@@ -2368,6 +2372,7 @@ function oscwrap {

     echo $((end - start)) >> $OSCWRAP_TIMER_FILE

     echo "$out"

+    $xtrace

     return $rc

 }

@@ -1472,7 +1472,10 @@ fi

 # ===============

 # Prepare bash completion for OSC

-openstack complete | sudo tee /etc/bash_completion.d/osc.bash_completion > /dev/null

+# Note we use "command" to avoid the timing wrapper

+# which isn't relevant here and floods logs

+command openstack complete \

+    | sudo tee /etc/bash_completion.d/osc.bash_completion > /dev/null

 # If cinder is configured, set global_filter for PV devices

 if is_service_enabled cinder; then