From a254fabee865e63d0ec9b0c3e846f02380bea1f1 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 3 Apr 2018 07:52:28 -0700 Subject: Add missing heat template env values Change-Id: I1ed5fc8f8a3c98d399aa9558cb552a2a86bb8a27 Issue-ID: INT-278 Signed-off-by: Gary Wu --- test/ete/scripts/deploy-onap.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test/ete/scripts') diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh index 68ca34830..689482c2e 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -39,13 +39,13 @@ popd sed "1,/${SENTINEL}/d" ${ENV_SRC} >> ${ENV_FILE} cat ${ENV_FILE} -sdiff -w 180 ${ENV_SRC} ${ENV_FILE} +diff ${ENV_SRC} ${ENV_FILE} # generate final heat template # add apt proxy to heat template if applicable if [ -x $LAB_DIR/apt-proxy.sh ]; then $LAB_DIR/apt-proxy.sh ${YAML_FILE} - sdiff -w 180 ${YAML_SRC} ${YAML_FILE} + diff ${YAML_SRC} ${YAML_FILE} fi @@ -60,7 +60,9 @@ $WORKSPACE/test/ete/scripts/teardown-onap.sh # create new stack STACK="ete-$(uuidgen | cut -c-8)" echo "New Stack Name: ${STACK}" -openstack stack create -t ${YAML_FILE} -e ${ENV_FILE} $STACK +if ! openstack stack create -t ${YAML_FILE} -e ${ENV_FILE} $STACK; then + exit 1 +fi while [ "CREATE_IN_PROGRESS" == "$(openstack stack show -c stack_status -f value $STACK)" ]; do sleep 20 -- cgit 1.2.3-korg