summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-12-24 08:03:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-12-24 08:03:47 +0000
commitb90c5379dc9c8108847dd6a43437edc363ce232e (patch)
treeae6125e87f93be6db4583e3537aee6f96a4a4c11
parent96d2f4495c69dd1e45b79c4eebd18681ae42dfdb (diff)
parent5d2b3e4613b3cac3895100199617e9dd7c5c632a (diff)
Merge "bug-fix: add BRANCH var for apex config prep" into stable/gambia
-rw-r--r--utils/env_prepare/config_prepare.sh1
1 files changed, 1 insertions, 0 deletions
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}