diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-19 12:21:00 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-19 12:24:29 +0400 |
| commit | c285a889f9121b27224cf53ae2cb4b6ed5b05493 (patch) | |
| tree | ec1019a3e45ac29aba2567eb5b8c95fc25e080f7 /jjb | |
| parent | 50a54afe25291eae378761efda102a39e2a074a9 (diff) | |
[fuel] Inject k8s config into yardstick container
Change-Id: If3073db238490331390f7f1051078c6be29f2327
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/yardstick/yardstick-daily.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index 58d590c27..dfe1404f0 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -38,7 +38,11 @@ elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh fi elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then - cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" + if [[ "${DEPLOY_SCENARIO:0:2}" == 'k8' ]]; then + rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf" + else + cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" + fi sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa" fi |