From: Delia Popescu <delia.popescu@enea.com>
Date: Tue, 3 Oct 2017 10:04:52 +0000 (+0300)
Subject: Add CACERT file to Yardstick Container for fuel installer
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1442c41b802258e6ec493a09ffe0234445afa342;p=releng.git

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>
---

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