Merge "Update cloud image CentOSStream8 builder x86_64"

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

diff --git a/jjb/integration/integration-get-slave-addresses.sh b/jjb/integration/integration-get-slave-addresses.sh
index 9f57dfc7ae72388bb329bfc6da15c2545330008c..80eabb6fd52742f8ebed84a57fe47e68c0707b91 100644 (file)
--- a/jjb/integration/integration-get-slave-addresses.sh
+++ b/jjb/integration/integration-get-slave-addresses.sh
@@ -1,4 +1,13 @@
-#!/bin/bash
+#!/bin/bash -l
+
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+lf-activate-venv --python python3 \
+    python-heatclient \
+    python-openstackclient \
+    yq
+
 # Get the Controller and Tools VM slave addresses
 
 set -x
@@ -8,9 +17,6 @@ TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 OPENSTACK_CONTROLLERS=()
 
-OPENSTACK_VENV="/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source $OPENSTACK_VENV/bin/activate
 mapfile -t ADDR <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
 
 # The next two blocks of code will parse the list of vm IP's hostnames to determine which type of node
@@ -71,7 +77,7 @@ if [ ${#OPENSTACK_CONTROLLERS[@]} -eq 2 ]; then
     ctrl_index=$((ctrl_index -1))
     tmp_addr=${OPENSTACK_SYSTEM[0]}
     OPENSTACK_SYSTEM[0]=${OPENSTACK_SYSTEM[$ctrl_index]}
-    OPENSTACK_SYSTEM[$ctrl_index]=$tmp_addr
+    OPENSTACK_SYSTEM[ctrl_index]=$tmp_addr
 fi
 
 # Add alias for ODL_SYSTEM_1_IP as ODL_SYSTEM_IP