diff options
| -rwxr-xr-x | bootstrap/installer-docker.sh-template | 15 | ||||
| -rwxr-xr-x | bootstrap/teardown.sh | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/bootstrap/installer-docker.sh-template b/bootstrap/installer-docker.sh-template index 9900d06..09d1dcd 100755 --- a/bootstrap/installer-docker.sh-template +++ b/bootstrap/installer-docker.sh-template @@ -370,8 +370,7 @@ cfy executions start -d DockerComponent -w install # CDAP cluster -#cfy install -p ./blueprints/cdap/${CDAPBP} -b cdapbp7 -d cdap7 -i ../${INPUTS} -i "location_id=${LOCATION}" - +cfy install -p ./blueprints/cdap/${CDAPBP} -b cdapbp7 -d cdap7 -i ../${INPUTS} -i "location_id=${LOCATION}" # config binding service cfy install -p ./blueprints/cbs/${CBSBP} -b config_binding_service -d config_binding_service -i "location_id=${LOCATION}" @@ -396,8 +395,18 @@ cfy install -p ./blueprints/dh/${DHBP} -b DeploymentHandlerBP -d DeploymentHandl cfy install -p ./blueprints/ph/${PHBP} -b policy_handler_BP -d policy_handler -i 'policy_handler_image=nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.policy-handler:1.1-latest' -i "location_id=${LOCATION}" -i ../config/phinputs.yaml +# Wait for the CDAP cluster to be registered in Consul +echo "Waiting for CDAP cluster to register" +until curl -Ss http://${CONSULIP}:8500/v1/catalog/service/cdap | grep cdap +do + echo -n . + sleep 30 +done +echo "CDAP cluster registered" + + # CDAP Broker -#cfy install -p ./blueprints/cdapbroker/${CDAPBROKERBP} -b cdapbroker -d cdapbroker -i "location_id=${LOCATION}" +cfy install -p ./blueprints/cdapbroker/${CDAPBROKERBP} -b cdapbroker -d cdapbroker -i "location_id=${LOCATION}" # Keep the container up diff --git a/bootstrap/teardown.sh b/bootstrap/teardown.sh index 4d1836c..ccfc64f 100755 --- a/bootstrap/teardown.sh +++ b/bootstrap/teardown.sh @@ -29,6 +29,8 @@ source ./dcaeinstall/bin/activate cd ./consul cfy status set +e +cfy uninstall -d cdapbroker +cfy uninstall -d cdap7 cfy uninstall -d policy_handler cfy uninstall -d DeploymentHandler cfy uninstall -d PlatformServicesInventory |