X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-copy-ssh-keys.sh;h=b5af750fb865f246a833e798a43bca6977bc840f;hb=39ad49f2436d89b0ad6a0645202c5269b30a9c69;hp=b4f1cbf34522adf24c07eca8d2cb7d06c58bbb15;hpb=344a2aee877988097613254fbc74f72f5ac7c0bf;p=releng%2Fbuilder.git

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index b4f1cbf34..b5af750fb 100644
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -3,11 +3,14 @@ echo "----------> Copy ssh public keys to csit lab"
 
 # shellcheck disable=SC1090
 source "$WORKSPACE/.venv-openstack/bin/activate"
+PYTHON="$WORKSPACE/.venv-openstack/bin/python"
+OPENSTACK="$WORKSPACE/.venv-openstack/bin/openstack"
 
 function copy-ssh-keys-to-slave() {
     RETRIES=60
     for j in $(seq 1 $RETRIES); do
-        if ssh-copy-id -i /home/jenkins/.ssh/id_rsa.pub "jenkins@${i}" > /dev/null 2>&1; then
+        # shellcheck disable=SC2092
+        if `ssh-copy-id -i /home/jenkins/.ssh/id_rsa.pub "jenkins@${i}" > /dev/null 2>&1`; then
             ssh "jenkins@${i}" 'echo "$(facter ipaddress_eth0) $(/bin/hostname)" | sudo tee -a /etc/hosts'
             echo "Successfully copied public keys to slave ${i}"
             break
@@ -30,12 +33,13 @@ function copy-ssh-keys-to-slave() {
 
 # Print the Stack outputs parameters so that we can identify which IPs belong
 # to which VM types.
-openstack --os-cloud rackspace stack show -c outputs "$STACK_NAME"
+$PYTHON $OPENSTACK stack show -c outputs "$STACK_NAME"
 
-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 | .[]')
+# shellcheck disable=SC2006
+ADDR=(`$PYTHON $OPENSTACK stack show -f json -c outputs "$STACK_NAME" | \
+       jq -r '.outputs[] | \
+              select(.output_key | match("^vm_[0-9]+_ips\$")) | \
+              .output_value | .[]'`)
 pids=""
 for i in "${ADDR[@]}"; do
     ( copy-ssh-keys-to-slave ) &