summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-11-29 08:31:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-29 08:31:42 +0000
commit6576b8fe77019840b3ce3dfd31cc365923065099 (patch)
treeaaeda6c85a77aa83b81ee42577a7ed287b4bc6b3
parent5badc159642308bd23013b5c630010e4d7715166 (diff)
parenta8470ee159b7672f1ea5ccbc8ff81cb1a60f5292 (diff)
Merge "bug-fix: add BRANCH var for apex config prep"
-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}