summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2017-10-03 13:04:52 +0300
committerDelia Popescu <delia.popescu@enea.com>2017-10-03 13:14:46 +0300
commit1442c41b802258e6ec493a09ffe0234445afa342 (patch)
treef5ee8be122cf915ce36d9714c4b4fc656fd4208a /jjb
parent1233f8b2a7f2ad058ee49c8c074b3933237bef0b (diff)
Add CACERT file to Yardstick Container for fuel installer
CACERT file is needed for authentication to and between openstack services. Change-Id: Ic6c48ad0ac6f16c2dca82214f5b44d2f8dcac4fc Signed-off-by: Delia Popescu <delia.popescu@enea.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index a2d4ec20a..8841e09db 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -18,10 +18,6 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
fi
fi
-if [[ "${INSTALLER_TYPE}" == 'fuel' ]]; then
- sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
-fi
-
if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
rc_file_vol="-v /home/ubuntu/config:/etc/yardstick/admin.conf"
@@ -36,6 +32,9 @@ elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then
cacert_file_vol="-v ${HOME}/os_cacert:/etc/yardstick/os_cacert"
echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh
rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/etc/yardstick/openstack.creds"
+elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
+ cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
+ sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
else
rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/etc/yardstick/openstack.creds"
fi