summaryrefslogtreecommitdiffstats
path: root/k8s-bootstrap-container/bootstrap.sh
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-04-10 09:32:32 -0400
committerJack Lucas <jflucas@research.att.com>2019-04-10 10:49:20 -0400
commit397862086166d473872e4ee41a7dc75dae050456 (patch)
tree5675df1062b9a966307cd8030d97f8a4648fb6bc /k8s-bootstrap-container/bootstrap.sh
parenta3bcc9597adb95421ce4940c7dc92d9e5771a519 (diff)
Fix dashboard bootstrap
Also remove deployment of datafile collector. Remove generated Dockerfiles. Issue-ID: DCAEGEN2-1418 Issue-ID: DCAEGEN2-1419 Change-Id: Ie2394fcd47ff9f80178e1e1aa2f1f383c4db700e Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'k8s-bootstrap-container/bootstrap.sh')
-rwxr-xr-xk8s-bootstrap-container/bootstrap.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index 503cec2..257775d 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -191,11 +191,9 @@ trap - ERR
set +e
# Deploy platform components
-# Allow for some parallelism to speed up the process. Probably could be somewhat more aggressive.
-deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml &
-deploy dashboard k8s-dashboard.yaml k8s-dashboard-inputs.yaml &
-PG_PID=$!
-wait ${PG_PID}
+# No opportunity for parallelism here -- dashboard needs pgaas
+deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
+deploy dashboard k8s-dashboard.yaml k8s-dashboard-inputs.yaml
# Deploy service components
# tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
@@ -204,7 +202,6 @@ deploy ves k8s-ves.yaml k8s-ves-inputs.yaml &
deploy snmptrap k8s-snmptrap.yaml k8s-snmptrap-inputs.yaml &
deploy prh k8s-prh.yaml k8s-prh-inputs.yaml &
deploy hv-ves k8s-hv-ves.yaml k8s-hv_ves-inputs.yaml &
-deploy datafile-collector k8s-datafile-collector.yaml k8s-datafile-collector-inputs.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