From d7aca20b047d2cbbafca0e3b40390a30d251e33a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 11 Dec 2018 16:10:55 +0100 Subject: [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 --- jjb/functest/functest-alpine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jjb/functest') diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 42bf60b0a..91ca5eb88 100755 --- 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 -- cgit 1.2.3-korg