diff options
| author |   blsaws <bryan.sullivan@att.com> | 2016-09-15 07:07:17 -0700 |
|---|---|---|
| committer | blsaws <bryan.sullivan@att.com> | 2016-09-15 07:07:17 -0700 |
| commit | 97566fda3af4ad1224109cd34fdd4c6d4dc65058 (patch) | |
| tree | 521c4dce870adfac65d31dfa32971304588f0e2e /tests/vHello_Tacker.sh | |
| parent | 34080cb1c9c05aaeeb13d34bfbf9fd54bbaf25f9 (diff) | |
Further updates in cloudify re-testing
JIRA: MODELS-23
Change-Id: Ie404b4c5056a8938fe1272af9c98141153bf79ba
Signed-off-by: blsaws <bryan.sullivan@att.com>
Diffstat (limited to 'tests/vHello_Tacker.sh')
| -rw-r--r-- | tests/vHello_Tacker.sh | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/tests/vHello_Tacker.sh b/tests/vHello_Tacker.sh index 4868db6..82cbdb7 100644 --- a/tests/vHello_Tacker.sh +++ b/tests/vHello_Tacker.sh @@ -246,23 +246,6 @@ stop() { fi } -clean () { - echo "$0: setup OpenStack CLI environment" - source /tmp/tacker/admin-openrc.sh - - if [[ "$1" == "tacker-api" ]]; then - echo "$0: Tacker API use is not yet implemented" - else - # Tacker CLI use - echo "$0: Stop and uninstall blueprint" - stop - - echo "$0: Uninstall Tacker" - bash utils/tacker-setup.sh $1 clean - fi - pass -} - forward_to_container () { echo "$0: pass $2 command to vHello.sh in tacker container" CONTAINER=$(sudo docker ps -a | awk "/tacker/ { print \$1 }") @@ -290,7 +273,8 @@ case "$2" in pass ;; clean) - clean $1 + echo "$0: Uninstall Tacker and test environment" + bash utils/tacker-setup.sh $1 clean pass ;; *) |