diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-10-03 19:12:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-03 19:12:56 +0000 |
| commit | b67f40692d5d353559cff6ba1636c5b0552ff06c (patch) | |
| tree | f6b6b74002a85ffa3e13f4db7c27460ffea2837a /jjb | |
| parent | ef6779412aca08e15b6172468d712d32110857b6 (diff) | |
| parent | 1442c41b802258e6ec493a09ffe0234445afa342 (diff) | |
Merge "Add CACERT file to Yardstick Container for fuel installer"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/yardstick/yardstick-daily.sh | 7 |
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 |