From: Markos Chandras Date: Tue, 10 Oct 2017 10:09:25 +0000 (+0000) Subject: Merge "xci: Bump bifrost SHA" X-Git-Tag: 6.0.0~262 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e5a91700c558380f664a7e0739828d18db7716e5;p=releng-xci.git Merge "xci: Bump bifrost SHA" --- e5a91700c558380f664a7e0739828d18db7716e5 diff --cc bifrost/scripts/bifrost-provision.sh index d48d6a89,d85695d3..0a2987dd --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@@ -16,12 -16,9 +16,12 @@@ BIFROST_HOME=$SCRIPT_HOME/. ANSIBLE_INSTALL_ROOT=${ANSIBLE_INSTALL_ROOT:-/opt/stack} ENABLE_VENV="false" USE_DHCP="false" - USE_VENV="false" + USE_VENV="true" BUILD_IMAGE=true PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} +# This is normally exported by XCI env but we should initialize it here +# in case we run this script on its own for debug purposes +XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-} # Ensure the right inventory files is used based on branch CURRENT_BIFROST_BRANCH=$(git rev-parse --abbrev-ref HEAD)