diff options
| author |   Yang Xu <yang.xu3@huawei.com> | 2018-04-03 16:45:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-03 16:45:58 +0000 |
| commit | 93a4fc24ec4fcd5ac49b7231f2c666ab496410d9 (patch) | |
| tree | 4e8dabb35b105ac9519933b3dab86598f1e4496a | |
| parent | 6515d690ba20e2859b5bcb109a858f85dcb36a40 (diff) | |
| parent | a254fabee865e63d0ec9b0c3e846f02380bea1f1 (diff) | |
Merge "Add missing heat template env values"
| -rw-r--r-- | test/ete/labs/tlab/onap-openstack-template.env | 4 | ||||
| -rw-r--r-- | test/ete/labs/windriver/onap-openstack-template.env | 4 | ||||
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 8 |
3 files changed, 13 insertions, 3 deletions
diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index 52ecae9d8..b0be26bfe 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -89,6 +89,10 @@ parameters: 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 27cd0ef62..626281758 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -89,6 +89,10 @@ parameters: 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 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 |