diff options
Diffstat (limited to 'xci/xci-deploy.sh')
| -rwxr-xr-x | xci/xci-deploy.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 20f67e61..c0c1a8ef 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -109,10 +109,9 @@ echo "xci flavor: $XCI_FLAVOR" echo "xci installer: $INSTALLER_TYPE" echo "infra deployment: $INFRA_DEPLOYMENT" echo "opnfv/releng-xci version: $(git rev-parse HEAD)" -echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION" +[[ "$INFRA_DEPLOYMENT" == "bifrost" ]] && echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION" [[ "$INSTALLER_TYPE" == "osa" ]] && echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION" [[ "$INSTALLER_TYPE" == "kubespray" ]] && echo "kubespray version: $KUBESPRAY_VERSION" -[[ "$INFRA_DEPLOYMENT" == "bifrost" ]] && echo "bifrost version: $OPENSTACK_BIFROST_VERSION" echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- @@ -154,7 +153,8 @@ echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- # Get scenario variables overrides #------------------------------------------------------------------------------- -source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || : +source $(find $XCI_PATH/xci/scenarios/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || \ + source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || : # Deploy infrastructure based on the selected deloyment method echo "Info: Deploying hardware using '${INFRA_DEPLOYMENT}'" |