From 0590e2cb1526c4542f39c98717e48fc761024256 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Tue, 7 Jun 2022 13:20:31 +0400 Subject: [PATCH] Tunnel public network from rally to controller Change-Id: Ia668de17bc99ae198354924caae8761267b226d3 --- maintenance-ci/mos/rally-docker/run_rally_tempest.sh | 2 ++ maintenance-ci/mos/scripts/maintenance-tempest-runner.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/maintenance-ci/mos/rally-docker/run_rally_tempest.sh b/maintenance-ci/mos/rally-docker/run_rally_tempest.sh index e537be4..4898b8d 100644 --- 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 b07b1f7..be8bca5 100644 --- 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}"/ -- 2.45.2