Add pg and component installs

Change-Id: I6209f8edb4a15c0a099447bcec60f7faa0dcec44
Issue-Id: DCAEGEN2-190
Signed-off-by: Jack Lucas <jflucas@research.att.com>

diff --git a/bootstrap/installer-docker.sh-template b/bootstrap/installer-docker.sh-template
index ddf330d..618b165 100755 (executable)
--- a/bootstrap/installer-docker.sh-template
+++ b/bootstrap/installer-docker.sh-template
@@ -32,19 +32,29 @@ OSPLUGINWGN=https://github.com/cloudify-cosmo/cloudify-openstack-plugin/releases
 PLATBPSRC={{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases }}/blueprints
 DOCKERBP=DockerBP.yaml
 CBSBP=config_binding_service.yaml
+PGBP=pgaas-onevm.yaml
 CDAPBP=cdapbp7.yaml
 CDAPBROKERBP=cdap_broker.yaml
 INVBP=inventory.yaml
 DHBP=DeploymentHandler.yaml
 PHBP=policy_handler.yaml
+VESBP=ves.yaml
+TCABP=tca.yaml
+HRULESBP=holmes-rules.yaml
+HENGINEBP=holmes-engine.yaml
 
 DOCKERBPURL="${PLATBPSRC}/${DOCKERBP}"
 CBSBPURL="${PLATBPSRC}/${CBSBP}"
+PGBPURL=${PLATBPSRC}/${PGBP}
 CDAPBPURL="${PLATBPSRC}/${CDAPBP}"
 CDAPBROKERBPURL="${PLATBPSRC}/${CDAPBROKERBP}"
 INVBPURL="${PLATBPSRC}/${INVBP}"
 DHBPURL="${PLATBPSRC}/${DHBP}"
 PHBPURL="${PLATBPSRC}/${PHBP}"
+VESBPURL="${PLATBPSRC}/${VESBP}"
+TCABPURL="${PLATBPSRC}/${TCABP}"
+HRULESBPURL="${PLATBPSRC}/${HRULESBP}"
+HENGINEBPURL="${PLATBPSRC}/${HENGINEBP}"
 
 LOCATIONID=$(printenv LOCATION)
 
@@ -360,11 +370,16 @@ rm $ENVINI
 # Get component blueprints
 wget -P ./blueprints/docker/ ${DOCKERBPURL}
 wget -P ./blueprints/cbs/ ${CBSBPURL}
+wget -P ./blueprints/pg/ ${PGBPURL}
 wget -P ./blueprints/cdap/ ${CDAPBPURL}
 wget -P ./blueprints/cdapbroker/ ${CDAPBROKERBPURL}
 wget -P ./blueprints/inv/ ${INVBPURL}
 wget -P ./blueprints/dh/ ${DHBPURL}
 wget -P ./blueprints/ph/ ${PHBPURL}
+wget -P ./blueprints/ves/ ${VESBPURL}
+wget -P ./blueprints/tca/ ${TCABPURL}
+wget -P ./blueprints/hrules/ ${HRULESBPURL}
+wget -P ./blueprints/hengine/ ${HENGINEBPURL}
 
 
 # Set up the credentials for access to the Docker registry
@@ -392,6 +407,10 @@ cfy install -p ./blueprints/cdap/${CDAPBP} -b cdapbp7 -d cdap7 -i ../${INPUTS} -
 cfy install -p ./blueprints/cbs/${CBSBP} -b config_binding_service -d config_binding_service -i "location_id=${LOCATION}"
 
 
+# Postgres
+cfy install -p ./blueprints/pg/${PGBP} -b pgaas -d pgaas  -i ../${INPUTS}
+
+
 # Inventory
 cfy install -p ./blueprints/inv/${INVBP} -b PlatformServicesInventory -d PlatformServicesInventory -i "location_id=${LOCATION}" -i ../config/invinputs.yaml
 
@@ -425,6 +444,18 @@ echo "CDAP cluster registered"
 cfy install -p ./blueprints/cdapbroker/${CDAPBROKERBP} -b cdapbroker -d cdapbroker -i "location_id=${LOCATION}"
 
 
+# VES
+cfy install -p ./blueprints/ves/${VESBP} -b ves -d ves -i ../config/vesinput.yaml
+
+
+# TCA
+cfy install -p ./blueprints/tca/${TCABP} -b tca -d tca -i ../config/tcainputs.yaml
+
+# Holmes
+cfy install -p ./blueprints/hrules/${HRULESBP} -b hrules -d hrules -i ../config/hr-ip.yaml
+cfy install -p ./blueprints/hengine/${HENGINEBP} -b hengine -d hengine -i ../config/he-ip.yaml
+
+
 # write out IP addresses
 echo "$CONSULIP" > "$STARTDIR"/config/runtime.ip.consul
 echo "$PUBIP" > "$STARTDIR"/config/runtime.ip.cm

diff --git a/bootstrap/teardown.sh b/bootstrap/teardown.sh
index ccfc64f..eb7ed61 100755 (executable)
--- a/bootstrap/teardown.sh
+++ b/bootstrap/teardown.sh
@@ -29,11 +29,16 @@ source ./dcaeinstall/bin/activate
 cd ./consul
 cfy status
 set +e
+cfy uninstall -d hengine
+cfy uninstall -d hrules
+cfy uninstall -d tca
+cfy uninstall -d ves
 cfy uninstall -d cdapbroker
 cfy uninstall -d cdap7
 cfy uninstall -d policy_handler
 cfy uninstall -d DeploymentHandler
 cfy uninstall -d PlatformServicesInventory
+cfy uninstall -d pgaas
 cfy uninstall -d config_binding_service
 cfy executions start -w uninstall -d DockerComponent
 cfy deployments delete -d DockerComponent