X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-daily.sh;h=dfe1404f076a35805a3ce6cd2dd30735395a62ac;hb=c285a889f9121b27224cf53ae2cb4b6ed5b05493;hp=2fd68484eb83a256fc3e40eeb766437855c4a26f;hpb=b87f1d4130984073ed11989f06c7ccf6a28985d5;p=releng.git

diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 2fd68484e..dfe1404f0 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -38,13 +38,13 @@ 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
-# Set iptables rule to allow forwarding return traffic for container
-if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
-    sudo iptables -I FORWARD -j RETURN
-fi
 
 opts="--privileged=true --rm"
 envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
@@ -63,6 +63,7 @@ if [ "$(uname -m)" = 'aarch64' ]; then
 fi
 echo "Yardstick: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
 docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
+docker images
 
 # map log directory
 branch=${BRANCH##*/}