diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-12 10:45:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-12-12 10:45:48 +0000 |
| commit | 9d6075d0654c19bbeb3330e6e8a5d177d5e5aa12 (patch) | |
| tree | de498ceb1724291f3a08824197a0831c4f4f69ed | |
| parent | 6f030e2cc37dedc9bee3bb2a50bc28e455d5ccdd (diff) | |
| parent | d7aca20b047d2cbbafca0e3b40390a30d251e33a (diff) | |
Merge "[utils, functest] Fix SSL-enabled Fuel condition"
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 2 | ||||
| -rwxr-xr-x | utils/fetch_os_creds.sh | 2 |
2 files changed, 2 insertions, 2 deletions
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 diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 501095036..4a66187e5 100755 --- 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 |