79fc935640
The change Ibb7423d243d57852dada0b6298463bbdfc6dc63c that introduced the os-brick plugin introduced a flaw where the xtrace state wasn't restored after the end of the plugin's execution. The end behavior is that devstack's logs were with way less information, difficulting the debugging of the build. This patch fixes the variable that was intended to hold the xtrace state (it was using cinder's) and restoring the state at the end of the script. Change-Id: I47c6c794a9704049b089142eca5603d1183f8a10
32 lines
633 B
Bash
32 lines
633 B
Bash
#!/bin/bash
|
|
#
|
|
# lib/os_brick
|
|
# Install **os-brick** python module from source
|
|
|
|
# Dependencies:
|
|
#
|
|
# - functions
|
|
# - DEST, DATA_DIR must be defined
|
|
|
|
# stack.sh
|
|
# ---------
|
|
# - install_os_brick
|
|
|
|
# Save trace setting
|
|
_XTRACE_OS_BRICK=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
|
|
GITDIR["os-brick"]=$DEST/os-brick
|
|
|
|
# Install os_brick from git only if requested, otherwise it will be pulled from
|
|
# pip repositories by requirements of projects that need it.
|
|
function install_os_brick {
|
|
if use_library_from_git "os-brick"; then
|
|
git_clone_by_name "os-brick"
|
|
setup_dev_lib "os-brick"
|
|
fi
|
|
}
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_OS_BRICK |