diff options
| author |   Tony Hansen <tony@att.com> | 2018-09-15 01:38:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-15 01:38:15 +0000 |
| commit | bcb980423cdeff5c34e4eaeea9792b85a1810319 (patch) | |
| tree | ad21bf2cc14654d0167a5f0215dab001cc3bd2d2 | |
| parent | 168d43a3e27255213140bde9b0c8087a95b85a36 (diff) | |
| parent | 1e818c66e225ea291fb4b09c5e1f847ad30a334f (diff) | |
Merge "Configure DCAEGEN2 to use HV VES blueprint"
| -rwxr-xr-x | bootstrap/installer-docker.sh-template | 7 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/bootstrap.sh | 3 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/load-blueprints.sh | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/bootstrap/installer-docker.sh-template b/bootstrap/installer-docker.sh-template index 21ccabb..4f889fc 100755 --- a/bootstrap/installer-docker.sh-template +++ b/bootstrap/installer-docker.sh-template @@ -40,6 +40,7 @@ TCABP=tca.yaml HRULESBP=holmes-rules.yaml HENGINEBP=holmes-engine.yaml PRHBP=prh.yaml +HVVESBP=hv-ves.yaml DOCKERBPURL="${PLATBPSRC}/${DOCKERBP}" CBSBPURL="${PLATBPSRC}/${CBSBP}" @@ -54,6 +55,7 @@ TCABPURL="${PLATBPSRC}/${TCABP}" HRULESBPURL="${PLATBPSRC}/${HRULESBP}" HENGINEBPURL="${PLATBPSRC}/${HENGINEBP}" PRHBPURL="${PLATBPSRC}/${PRHBP}" +HVVESBPURL="${PLATBPSRC}/${HVVESBP}" LOCATIONID=$(printenv LOCATION) @@ -372,6 +374,7 @@ wget -P ./blueprints/tca/ ${TCABPURL} wget -P ./blueprints/hrules/ ${HRULESBPURL} wget -P ./blueprints/hengine/ ${HENGINEBPURL} wget -P ./blueprints/prh/ ${PRHBPURL} +wget -P ./blueprints/hv-ves/ ${HVVESBPURL} # Set up the credentials for access to the Docker registry @@ -450,6 +453,10 @@ cfy install -p ./blueprints/hengine/${HENGINEBP} -b hengine -d hengine -i ../con # PRH cfy install -p ./blueprints/prh/${PRHBP} -b prh -d prh -i ../config/prhinput.yaml +# HV-VES +cfy install -p ./blueprints/hv-ves/${HVVESBP} -b hv-ves -d hv-ves + + # write out IP addresses echo "$CONSULIP" > "$STARTDIR"/config/runtime.ip.consul echo "$PUBIP" > "$STARTDIR"/config/runtime.ip.cm diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh index 2fe0cac..37c7e58 100755 --- a/k8s-bootstrap-container/bootstrap.sh +++ b/k8s-bootstrap-container/bootstrap.sh @@ -217,10 +217,11 @@ PH_PID=$! wait ${INV_PID} ${DH_PID} ${PH_PID} # Deploy service components -# tca, ves, prh can be deployed simultaneously +# tca, ves, prh, hv-ves can be deployed simultaneously deploy tca k8s-tca.yaml k8s-tca-inputs.yaml & deploy ves k8s-ves.yaml k8s-ves-inputs.yaml & deploy prh k8s-prh.yaml & +deploy hv-ves k8s-hv-ves.yaml & # holmes_rules must be deployed before holmes_engine, but holmes_rules can go in parallel with other service components deploy holmes_rules k8s-holmes-rules.yaml k8s-holmes_rules-inputs.yaml deploy holmes_engine k8s-holmes-engine.yaml k8s-holmes_engine-inputs.yaml diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh index 9410f61..ae7dc91 100755 --- a/k8s-bootstrap-container/load-blueprints.sh +++ b/k8s-bootstrap-container/load-blueprints.sh @@ -16,7 +16,8 @@ k8s-policy_handler.yaml \ k8s-pgaas-initdb.yaml \ k8s-tca.yaml \ k8s-ves.yaml \ -k8s-prh.yaml +k8s-prh.yaml \ +k8s-hv-ves.yaml " BPDEST=blueprints |