Append 3 more punt path protection TCs

[integration/test.git] / csit / scripts / set_federation_rabbit.sh

diff --git a/csit/scripts/set_federation_rabbit.sh b/csit/scripts/set_federation_rabbit.sh
index b6d70f74458e3dab9556df12a83b22b6dad3fce7..712aa15d8645d73b8a8350534066cf141677583f 100644 (file)
--- a/csit/scripts/set_federation_rabbit.sh
+++ b/csit/scripts/set_federation_rabbit.sh
@@ -35,11 +35,11 @@ EOF
     for i in `seq 1 ${NUM_OPENSTACK_SITES}`
     do
         FIRST_ODL_IN_SITE=ODL_SYSTEM_$(((i - 1) * NUM_ODLS_PER_SITE + 1))_IP
-        RABBIT_SERVER_IP=ODL_SYSTEM_${!FIRST_ODL_IN_SITE} # We install Rabbit on the first ODL in each site
+        RABBIT_SERVER_IP=${!FIRST_ODL_IN_SITE} # We install Rabbit on the first ODL in each site
         CONTROLLERIP=ODL_SYSTEM_$(((i - 1) * NUM_ODLS_PER_SITE + j))_IP
 
-        scp ${WORKSPACE}/install_federation_rabbit.sh ${!RABBIT_SERVER_IP}:/tmp/
-        ssh ${!RABBIT_SERVER_IP} 'bash /tmp/install_federation_rabbit.sh'
+        scp ${WORKSPACE}/install_federation_rabbit.sh ${RABBIT_SERVER_IP}:/tmp/
+        ssh ${RABBIT_SERVER_IP} 'bash /tmp/install_federation_rabbit.sh'
 
         for j in `seq 1 ${NUM_ODLS_PER_SITE}`
         do
@@ -48,12 +48,12 @@ EOF
                 HA_PROXY_IP=OPENSTACK_HAPROXY_${i}_IP
                 SITE_IP=${!HA_PROXY_IP}
             else
-                SITE_IP=${!FIRST_ODL_IN_SITE} # Should this really be the first IP in the site?
+                SITE_IP=${RABBIT_SERVER_IP}
             fi
-            echo "Setting rabbit client site ip to ${SITE_IP} on ${!RABBIT_SERVER_IP}"
+            echo "Setting rabbit client site IP to ${SITE_IP} and rabbit servier IP to ${RABBIT_SERVER_IP} on ${!ODL_IP}"
 
             scp ${WORKSPACE}/configure_federation_rabbit.sh ${!ODL_IP}:/tmp/
-            ssh ${!ODL_IP} 'bash /tmp/configure_federation_rabbit.sh' ${!RABBIT_SERVER_IP} ${SITE_IP}
+            ssh ${!ODL_IP} 'bash /tmp/configure_federation_rabbit.sh' ${RABBIT_SERVER_IP} ${SITE_IP}
         done
     done
 fi