Merge "Add missing heat template env values"
diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env
index 52ecae9..b0be26b 100644
--- a/test/ete/labs/tlab/onap-openstack-template.env
+++ b/test/ete/labs/tlab/onap-openstack-template.env
@@ -89,6 +89,10 @@
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
   openo_ip_addr: 10.0.14.1
+  music_ip_addr: 10.0.15.1
+  oof_ip_addr: 10.0.16.1
+  aaf_ip_addr: 10.0.13.1
+  nbi_ip_addr: 10.0.17.1
 
   ###########################
   #                         #
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 27cd0ef..6262817 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -89,6 +89,10 @@
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
   openo_ip_addr: 10.0.14.1
+  music_ip_addr: 10.0.15.1
+  oof_ip_addr: 10.0.16.1
+  aaf_ip_addr: 10.0.13.1
+  nbi_ip_addr: 10.0.17.1
 
   ###########################
   #                         #
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index 68ca348..689482c 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -39,13 +39,13 @@
 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 @@
 # 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