Merge "bug-fix: add BRANCH var for apex config prep"

[bottlenecks.git] / utils / env_prepare / config_prepare.sh

diff --git a/utils/env_prepare/config_prepare.sh b/utils/env_prepare/config_prepare.sh
index b13b5a0..2392319 100644 (file)
--- 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}
@@ -155,7 +156,7 @@ if [[ ${INSTALLER_TYPE} != "" ]]; then
             echo "export OS_CACERT=${OS_CACERT}" >> ${OPENRC}
             cat ${OPENRC}
         else
-           error "Couldn't find openstack cacert file: ${OS_CACERT}, please check if the it's been properly provided."
+           info "Couldn't find openstack cacert file: ${OS_CACERT}, please check if the it's been properly provided."
        fi
     else
         error "Couldn't find openstack rc file: ${OPENRC}, please check if the it's been properly provided."
@@ -166,6 +167,6 @@ if [[ ${INSTALLER_TYPE} != "" ]]; then
     if [[ -f "/tmp/id_rsa" ]]; then
         info "Path of ssh key file for openstack nodes is /tmp/id_rsa"
     else
-        error "Couldn't find the ssh key file for openstack nodes. If you are using user/pwd in pod.yaml, please ignore."
+        info "Couldn't find the ssh key file for openstack nodes. If you are using user/pwd in pod.yaml, please ignore."
     fi
 fi