summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2017-10-04 11:56:40 +0300
committerDelia Popescu <delia.popescu@enea.com>2017-10-04 13:59:00 +0300
commitf9fe2c801bc5420d17a36a3b43923b04b26e50fd (patch)
treebd0b7326fd6506d3eab2ac5d205a69ab656145cc
parent06bfdd12f95942652ac3dc3cfe635fa72692d7cc (diff)
Add OPNRC file to Yardstick container for fuel installer type
OPNRC file (openstack.creds) is needed to call openstack services It was not added any longer because we added a specific case for fuel installer to send SSH_KEY, OPNRC file and OS_CACERT to the container Change-Id: I235b138a77e06cded86a0b163ef383c1c37a0469 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 8841e09db..4b8c5d240 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -6,6 +6,8 @@ rc_file_vol=""
cacert_file_vol=""
sshkey=""
+rc_file_vol="-v ${HOME}/opnfv-openrc.sh:/etc/yardstick/openstack.creds"
+
if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
instack_mac=$(sudo virsh domiflist undercloud | grep default | \
grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
@@ -31,14 +33,10 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then
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
-
# 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