Merge "Fix for CSIT of VTN Openstack newton jobs"

[releng/builder.git] / jjb / integration / include-raw-integration-get-slave-addresses.sh

diff --git a/jjb/integration/include-raw-integration-get-slave-addresses.sh b/jjb/integration/include-raw-integration-get-slave-addresses.sh
index 293f23658dedca2cffc0af8fe34da66295b0f2ec..4cbb12b5af953a2da22fc1d703a1403239c0a129 100644 (file)
--- a/jjb/integration/include-raw-integration-get-slave-addresses.sh
+++ b/jjb/integration/include-raw-integration-get-slave-addresses.sh
@@ -4,18 +4,11 @@ ODL_SYSTEM=()
 TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 
-# TODO: Remove condition when we no longer use JClouds plugin
-if [ -z "$JCLOUDS_IPS" ]; then
-    # If JCLOUDS_IPS is not set then we will spawn instances with
-    # OpenStack Heat.
-    source $WORKSPACE/.venv-openstack/bin/activate
-    CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
-    MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
-    ADDR=($CONTROLLER_IPS $MININET_IPS)
-else
-    echo "OpenStack IPS are ${JCLOUDS_IPS}"
-    IFS=',' read -ra ADDR <<< "${JCLOUDS_IPS}"
-fi
+source $WORKSPACE/.venv-openstack/bin/activate
+ADDR=(`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | \
+       jq -r '.outputs[] | \
+              select(.output_key | match("^vm_[0-9]+_ips$")) | \
+              .output_value | .[]'`)
 
 for i in "${ADDR[@]}"
 do