From 4b28f9ded3112aea214da186a9f3da4295b6f67b Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Fri, 14 Jul 2017 03:05:24 +0000 Subject: Compass: add cacert file to enable SSL verification Now only Openstack https is supported by OSA repo LXC in compass deployment, so certification file is required to enable SSL verification. After [1] is merged, the cacert file os_cacert will be provided in the container compass-tasks. [1]: https://gerrit.opnfv.org/gerrit/#/c/37451/ Change-Id: Id747cef1955733a1c93feb20a26d503a5de1fb93 Signed-off-by: Linda Wang --- jjb/functest/set-functest-env.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'jjb/functest') diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 5f936f5d9..72a9e1eda 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -9,6 +9,10 @@ set +o pipefail # Prepare OpenStack credentials volume if [[ ${INSTALLER_TYPE} == 'joid' ]]; then rc_file_vol="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds" +elif [[ ${INSTALLER_TYPE} == 'compass' && ${BRANCH} == 'master' ]]; then + cacert_file_vol="-v ${HOME}/os_cacert:/home/opnfv/functest/conf/os_cacert" + echo "export OS_CACERT=/home/opnfv/functest/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh + rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/home/opnfv/functest/conf/openstack.creds" else rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/home/opnfv/functest/conf/openstack.creds" fi @@ -54,7 +58,7 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-h fi if [ "$BRANCH" != 'stable/danube' ]; then - volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" + volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol} ${cacert_file_vol}" else volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" fi -- cgit