[utils, functest] Fix SSL-enabled Fuel condition

Fuel enables SSL based on scenario type (only for HA), not based
on cluster type (baremetal or virtual).

Change-Id: I3dc94f953e9a8ee0e94028577270ac05c9318ad6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 42bf60b..91ca5eb 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -98,7 +98,7 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
 elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then
     cacert_file_vol="-v ${HOME}/os_cacert:${FUNCTEST_DIR}/conf/os_cacert"
     echo "export OS_CACERT=${FUNCTEST_DIR}/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh
-elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
+elif [[ ${INSTALLER_TYPE} == 'fuel' ]] && [[ "${DEPLOY_SCENARIO}" =~ -ha$ ]]; then
     cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
 fi
 

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 5010950..4a66187 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -113,7 +113,7 @@ if [ "$installer_type" == "fuel" ]; then
         ssh ${ssh_options} "${ssh_user}@${controller_ip}" \
             "sudo cat /root/keystonercv3" > "${dest_path}"
 
-        if [[ ! "${BUILD_TAG}" =~ 'virtual' ]]; then
+        if [[ ! "${DEPLOY_SCENARIO}" =~ -noha$ ]]; then
             ssh ${ssh_options} "${ssh_user}@${installer_ip}" \
                 "cat /etc/ssl/certs/os_cacert" > "${os_cacert}"
         fi