summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblsaws <bryan.sullivan@att.com>2016-08-31 18:54:54 -0700
committerblsaws <bryan.sullivan@att.com>2016-08-31 18:54:54 -0700
commite422ced611b6e62c0414af80430f6fb62794dc33 (patch)
tree39bc10f506f014cd7d1abab0c6ed817afb7c6296
parente437bd1fd296590707df199dfe915252452cbcdb (diff)
cd to /tmp/cloudify/blueprints
JIRA: MODELS-23 Change-Id: I646b4675add36edd4670094d0b91e87809cd3007 Signed-off-by: blsaws <bryan.sullivan@att.com>
-rw-r--r--tests/vHello.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/vHello.sh b/tests/vHello.sh
index adb5c8e..51c2a67 100644
--- a/tests/vHello.sh
+++ b/tests/vHello.sh
@@ -79,6 +79,8 @@ start() {
git checkout 3.4.1-build
fi
+ cd /tmp/cloudify/blueprints
+
echo "$0: setup OpenStack CLI environment"
source /tmp/cloudify/admin-openrc.sh
@@ -120,7 +122,7 @@ flavor: m1.small
external_network_name: $floating_network_name
webserver_port: 8080
key_name: vHello
-ssh_key_filename: ~/.ssh/vHello.pem
+ssh_key_filename: /root/.ssh/vHello.pem
ssh_user: ubuntu
ssh_port: 22
EOF
@@ -152,8 +154,9 @@ EOF
SERVER_URL=$(cfy deployments outputs -d vHello | awk "/ Value: / { print \$2 }")
else
echo "$0: install local blueprint"
- cfy local install --install-plugins -i vHello-inputs.yaml -p cloudify-cli-hello-world-example/blueprint.yaml --allow-custom-parameters --parameters="floating_network_name=$floating_network_name" --task-retries=10 --task-retry-interval=30
- if [ $? -eq 1 ]; then fail; fi
+# cfy local install --install-plugins -i vHello-inputs.yaml -p cloudify-cli-hello-world-example/blueprint.yaml --allow-custom-parameters --parameters="floating_network_name=$floating_network_name" --task-retries=10 --task-retry-interval=30
+ cfy local install -i vHello-inputs.yaml -p cloudify-cli-hello-world-example/blueprint.yaml --allow-custom-parameters --parameters="floating_network_name=$floating_network_name" --task-retries=10 --task-retry-interval=30
+ if [ $? -eq 1 ]; then fail; fi
echo "$0: get vHello server address"
SERVER_URL=$(cfy local outputs | awk "/http_endpoint/ { print \$2 }" | sed -- 's/"//g')