Tunnel public network from rally to controller

Change-Id: Ia668de17bc99ae198354924caae8761267b226d3

diff --git a/maintenance-ci/mos/rally-docker/run_rally_tempest.sh b/maintenance-ci/mos/rally-docker/run_rally_tempest.sh
index e537be4f07314ef755a3cbcec234ca4ea5e36e99..4898b8d350c4988f769aa22b5f1d386d81c5a579 100644 (file)
--- a/maintenance-ci/mos/rally-docker/run_rally_tempest.sh
+++ b/maintenance-ci/mos/rally-docker/run_rally_tempest.sh
@@ -50,10 +50,12 @@ echo "CTL node admin IP: ${CTL_ADMIN_IP}"
 echo "VM_USERNAME= ${VM_USERNAME}"
 echo "VM_PASSWORD= ${VM_PASSWORD}"
 echo "Management Network: ${MGMT_NET}"
+echo "Public Network: ${PUBLIC_NET}"
 
 ssh_to_fuel_master "ssh ${CTL_ADMIN_IP} echo \"$(cat /root/shared/id_rsa.pub) >> /root/.ssh/authorized_keys\""
 pkill sshuttle || true
 sshuttle -D -e "ssh ${SSH_OPTIONS[*]}" -r "${VM_USERNAME}@${CTL_ADMIN_IP}" ${MGMT_NET}
+sshuttle -D -e "ssh ${SSH_OPTIONS[*]}" -r "${VM_USERNAME}@${CTL_ADMIN_IP}" ${PUBLIC_NET}
 
 scp_from_controller /root/openrc ${OPENRC_FILE}
 if ssh_to_controller "test -f /var/lib/astute/haproxy/public_haproxy.pem" ; then

diff --git a/maintenance-ci/mos/scripts/maintenance-tempest-runner.sh b/maintenance-ci/mos/scripts/maintenance-tempest-runner.sh
index b07b1f7d934bcf579c880769d28c7fdb2f64f737..be8bca53f85cc08414daabc4601e77962a53e240 100644 (file)
--- a/maintenance-ci/mos/scripts/maintenance-tempest-runner.sh
+++ b/maintenance-ci/mos/scripts/maintenance-tempest-runner.sh
@@ -51,6 +51,7 @@ source "${VENV_PATH}/bin/activate"
   VM_PASSWORD="r00tme"
   FUEL_ADMIN_IP=$(dos.py list --ips | grep "${ENV_NAME}" | awk '{print $2}')
   MGMT_NET=$(dos.py net-list "${ENV_NAME}" | grep management | awk '{print $2}')
+  PUBLIC_NET=$(dos.py net-list "${ENV_NAME}" | grep public | awk '{print $2}')
   CTL_ADMIN_IP=$(ssh_to_fuel_master "fuel node" | grep -m1 controller | awk '{print $9}')
 deactivate
 
@@ -65,7 +66,7 @@ rm -rf "${LOCAL_STORAGE}"
 mkdir -p "${LOCAL_STORAGE}"
 
 IMAGE_ID=$(docker build -q maintenance-ci/mos/rally-docker)
-for i in VM_USERNAME VM_PASSWORD FUEL_ADMIN_IP MGMT_NET CTL_ADMIN_IP; do
+for i in VM_USERNAME VM_PASSWORD FUEL_ADMIN_IP MGMT_NET CTL_ADMIN_IP PUBLIC_NET; do
   echo "export ${i}=${!i}" >> "${LOCAL_STORAGE}"/ssh_connection_data.sh
 done
 cp "${HOME}"/.ssh/id_rsa* "${LOCAL_STORAGE}"/