summaryrefslogtreecommitdiffstats
path: root/k8s-bootstrap-container
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-01-28 10:37:02 -0500
committerJack Lucas <jflucas@research.att.com>2019-01-28 10:38:28 -0500
commitcddf9bfaa435c938c740a49203d21070fa91ff52 (patch)
tree13e777cd9b6afa1b9d58631a0def3216e38d1e7d /k8s-bootstrap-container
parent0025fda3bdc37f9cd1d436f9541eace023a0afc3 (diff)
Move inventory deployment to Helm
Issue-ID: DCAEGEN2-1089 Change-Id: Ideb129885e8774e7578eea8291889b232097862e Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'k8s-bootstrap-container')
-rwxr-xr-xk8s-bootstrap-container/bootstrap.sh3
-rwxr-xr-xk8s-bootstrap-container/load-blueprints.sh1
-rw-r--r--k8s-bootstrap-container/pom.xml2
3 files changed, 2 insertions, 4 deletions
diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index c037182..76504a7 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -204,8 +204,7 @@ set +e
deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml &
PG_PID=$!
wait ${PG_PID}
-# inventory, deployment_handler, and policy_handler can be deployed simultaneously
-deploy inventory k8s-inventory.yaml k8s-inventory-inputs.yaml &
+# deployment_handler and policy_handler can be deployed simultaneously
INV_PID=$!
deploy deployment_handler k8s-deployment_handler.yaml k8s-deployment_handler-inputs.yaml &
DH_PID=$!
diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh
index 716e601..098c022 100755
--- a/k8s-bootstrap-container/load-blueprints.sh
+++ b/k8s-bootstrap-container/load-blueprints.sh
@@ -10,7 +10,6 @@ BLUEPRINTS=\
k8s-deployment_handler.yaml \
k8s-holmes-engine.yaml \
k8s-holmes-rules.yaml \
-k8s-inventory.yaml \
k8s-policy_handler.yaml \
k8s-pgaas-initdb.yaml \
k8s-tca.yaml \
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index e695f6d..f02e2d8 100644
--- a/k8s-bootstrap-container/pom.xml
+++ b/k8s-bootstrap-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>k8s-bootstrap-container</artifactId>
<name>dcaegen2-deployments-k8s-bootstrap-container</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>