Merge "Change MININET to TOOLS_SYSTEM_IP in get-slave-addresses.sh"

[releng/builder.git] / jjb / integration / include-raw-integration-deploy-controller.sh

diff --git a/jjb/integration/include-raw-integration-deploy-controller.sh b/jjb/integration/include-raw-integration-deploy-controller.sh
index 6fcab672f5c820736f3f5f626f53f164db9b415e..6bff8acc7ffb79879d61fa02e0bd0d38d86afbf8 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller.sh
@@ -17,7 +17,7 @@ echo "Changing to /tmp"
 cd /tmp
 
 echo "Downloading the distribution from ${ACTUALBUNDLEURL}"
-wget --no-verbose  ${ACTUALBUNDLEURL}
+wget --no-verbose  '${ACTUALBUNDLEURL}'
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
@@ -40,12 +40,12 @@ cat \${MEMCONF}
 
 EOF
 
-CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2})
-for i in "${!CONTROLLERIPS[@]}"
+ODL_SYSTEM_IPS=(${ODL_SYSTEM_1_IP} ${ODL_SYSTEM_2_IP} ${ODL_SYSTEM_3_IP})
+for i in "${!ODL_SYSTEM_IPS[@]}"
 do
-    echo "Installing distribution in member-$i with IP address ${CONTROLLERIPS[$i]}"
-    scp ${WORKSPACE}/deploy-controller-script.sh ${CONTROLLERIPS[$i]}:/tmp
-    ssh ${CONTROLLERIPS[$i]} 'bash /tmp/deploy-controller-script.sh'
+    echo "Installing distribution in member-$((i+1)) with IP address ${ODL_SYSTEM_IPS[$i]}"
+    scp ${WORKSPACE}/deploy-controller-script.sh ${ODL_SYSTEM_IPS[$i]}:/tmp
+    ssh ${ODL_SYSTEM_IPS[$i]} 'bash /tmp/deploy-controller-script.sh'
 done
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :