From: Yang (Gabriel) Yu Date: Thu, 29 Nov 2018 08:31:42 +0000 (+0000) Subject: Merge "bug-fix: add BRANCH var for apex config prep" X-Git-Tag: opnfv-8.0.0~7 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=bottlenecks.git;a=commitdiff_plain;h=6576b8fe77019840b3ce3dfd31cc365923065099;hp=5badc159642308bd23013b5c630010e4d7715166 Merge "bug-fix: add BRANCH var for apex config prep" --- diff --git a/utils/env_prepare/config_prepare.sh b/utils/env_prepare/config_prepare.sh index 8de60438..23923198 100644 --- a/utils/env_prepare/config_prepare.sh +++ b/utils/env_prepare/config_prepare.sh @@ -97,6 +97,7 @@ if [[ ${INSTALLER_TYPE} != "" ]]; then ${RELENG_REPO}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} >${redirect} fi elif [[ $INSTALLER_TYPE == 'apex' ]]; then + export BRANCH="stable/fraser" INSTALLER_IP=$(sudo virsh domifaddr undercloud | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}') ${RELENG_REPO}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} -o ${OS_CACERT} >${redirect} echo ${cmd}