X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fopendaylight-infra-copy-ssh-keys.sh;h=7e3d8b0caf78f062f66d04d200e38ad223c74ef0;hb=45c5ed577a5c9e8514bc27c02fa68c0dc7accb58;hp=b5af750fb865f246a833e798a43bca6977bc840f;hpb=fc441b2b3f644271eef0b5f8807f6294b702ec9e;p=releng%2Fbuilder.git diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh index b5af750fb..7e3d8b0ca 100644 --- a/jjb/opendaylight-infra-copy-ssh-keys.sh +++ b/jjb/opendaylight-infra-copy-ssh-keys.sh @@ -1,10 +1,8 @@ #!/bin/bash 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" +# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 +source "/tmp/v/openstack/bin/activate" function copy-ssh-keys-to-slave() { RETRIES=60 @@ -33,10 +31,10 @@ function copy-ssh-keys-to-slave() { # Print the Stack outputs parameters so that we can identify which IPs belong # to which VM types. -$PYTHON $OPENSTACK stack show -c outputs "$STACK_NAME" +openstack stack show -c outputs "$STACK_NAME" # shellcheck disable=SC2006 -ADDR=(`$PYTHON $OPENSTACK stack show -f json -c outputs "$STACK_NAME" | \ +ADDR=(`openstack stack show -f json -c outputs "$STACK_NAME" | \ jq -r '.outputs[] | \ select(.output_key | match("^vm_[0-9]+_ips\$")) | \ .output_value | .[]'`)