Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[fuel] Inject k8s config into yardstick container
[releng.git]
/
jjb
/
yardstick
/
yardstick-daily.sh
diff --git
a/jjb/yardstick/yardstick-daily.sh
b/jjb/yardstick/yardstick-daily.sh
index
783c64e
..
dfe1404
100755
(executable)
--- 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
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
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} \
opts="--privileged=true --rm"
envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \