summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Dudycz <jakub.dudycz@nokia.com>2018-09-13 12:51:23 +0200
committerJakub Dudycz <jakub.dudycz@nokia.com>2018-09-13 15:22:33 +0200
commit1e818c66e225ea291fb4b09c5e1f847ad30a334f (patch)
treef8cd8c20d3649e9345a2e2985376933375935f7f
parent22b358530d76c08b3dd01529237dcfe0d5a37017 (diff)
Configure DCAEGEN2 to use HV VES blueprint
Change-Id: Ie39720533c1710caa8ca8719363ce7150c0a5084 Issue-ID: DCAEGEN2-776 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
-rwxr-xr-xbootstrap/installer-docker.sh-template7
-rwxr-xr-xk8s-bootstrap-container/bootstrap.sh3
-rwxr-xr-xk8s-bootstrap-container/load-blueprints.sh3
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