done
}
-# 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
+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)
pids=""
for i in "${ADDR[@]}"; do