diff options
| author |   Gary Wu <gary.wu@futurewei.com> | 2019-06-21 12:08:42 -0700 |
|---|---|---|
| committer | Gary Wu <gary.wu@futurewei.com> | 2019-06-21 12:39:32 -0700 |
| commit | a8aed9b9d6dea15f62c9098965d7c2c3b510bf78 (patch) | |
| tree | af348b0c0c7c52c9ca479af1b2cbb040d3f40096 /deployment/heat/onap-rke/scripts/deploy.sh | |
| parent | 70d75b5c53e2a7676061ae10ecf3a1241cf9cd9b (diff) | |
Move teardown script to RKE script directory
Also rename various Integration tenants
Issue-ID: INT-1117
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I7422088bdcb9ae8fbbf76bab0517f466d1279df3
Diffstat (limited to 'deployment/heat/onap-rke/scripts/deploy.sh')
| -rwxr-xr-x | deployment/heat/onap-rke/scripts/deploy.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/deployment/heat/onap-rke/scripts/deploy.sh b/deployment/heat/onap-rke/scripts/deploy.sh index e4e7d18df..ecefe2aaf 100755 --- a/deployment/heat/onap-rke/scripts/deploy.sh +++ b/deployment/heat/onap-rke/scripts/deploy.sh @@ -109,7 +109,11 @@ set -x SSH_KEY=~/.ssh/onap_key -source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh +if ! hash openstack jq +then + echo "ERROR: Required commands not found; please install openstack CLI and jq." + exit 2 +fi SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f export OS_PASSWORD_ENCRYPTED_FOR_ROBOT=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p) @@ -123,9 +127,9 @@ popd for n in $(seq 1 5); do if [ $full_deletion = true ] ; then - $WORKSPACE/test/ete/scripts/teardown-onap.sh -n $stack_name -q + $WORKSPACE/deployment/heat/onap-rke/scripts/teardown-onap.sh -n $stack_name -q else - $WORKSPACE/test/ete/scripts/teardown-onap.sh -n $stack_name + $WORKSPACE/deployment/heat/onap-rke/scripts/teardown-onap.sh -n $stack_name fi cd $WORKSPACE/deployment/heat/onap-rke |