From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 19 Apr 2019 08:21:00 +0000 (+0400)
Subject: [fuel] Inject k8s config into yardstick container
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=c285a889f9121b27224cf53ae2cb4b6ed5b05493

[fuel] Inject k8s config into yardstick container

Change-Id: If3073db238490331390f7f1051078c6be29f2327
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

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