From: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
Date: Thu, 21 Jun 2018 14:27:00 +0000 (+0800)
Subject: bug-fix: add BRANCH var for apex config prep
X-Git-Tag: opnfv-8.0.0~7^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=bottlenecks.git;a=commitdiff_plain;h=a8470ee159b7672f1ea5ccbc8ff81cb1a60f5292

bug-fix: add BRANCH var for apex config prep

utils/env_pre/config_pre.sh need BRANCH var to locate apex
overcloudrc.v3 file

Change-Id: I283d3d3af90b0a19b3ae9e4242a468d6a9abf3ce
Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
---

diff --git a/utils/env_prepare/config_prepare.sh b/utils/env_prepare/config_prepare.sh
index b13b5a02..d69b95ac 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}