From: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
Date: Thu, 29 Nov 2018 08:31:42 +0000 (+0000)
Subject: Merge "bug-fix: add BRANCH var for apex config prep"
X-Git-Tag: opnfv-8.0.0~7
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=bottlenecks.git;a=commitdiff_plain;h=6576b8fe77019840b3ce3dfd31cc365923065099;hp=-c

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

6576b8fe77019840b3ce3dfd31cc365923065099
diff --combined utils/env_prepare/config_prepare.sh
index 8de60438,d69b95ac..23923198
--- a/utils/env_prepare/config_prepare.sh
+++ b/utils/env_prepare/config_prepare.sh
@@@ -97,6 -97,7 +97,7 @@@ if [[ ${INSTALLER_TYPE} != "" ]]; the
              ${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 +156,7 @@@
              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 +167,6 @@@
      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