summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-06-21 22:27:00 +0800
committerYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-12-24 08:02:29 +0000
commit5d2b3e4613b3cac3895100199617e9dd7c5c632a (patch)
treecc156bc00b3a5db7200bbb79878d61f80389ef00 /utils
parentb38c653c910ed4cf83d6e8d0df1b88b1bb109f4b (diff)
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> (cherry picked from commit a8470ee159b7672f1ea5ccbc8ff81cb1a60f5292)
Diffstat (limited to 'utils')
-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}