summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--healthcheck-container/healthcheck.js6
-rw-r--r--healthcheck-container/pom.xml2
-rwxr-xr-xk8s-bootstrap-container/bootstrap.sh3
-rwxr-xr-xk8s-bootstrap-container/load-blueprints.sh1
-rw-r--r--k8s-bootstrap-container/pom.xml2
5 files changed, 6 insertions, 8 deletions
diff --git a/healthcheck-container/healthcheck.js b/healthcheck-container/healthcheck.js
index 9bc2086..1d6fccb 100644
--- a/healthcheck-container/healthcheck.js
+++ b/healthcheck-container/healthcheck.js
@@ -27,15 +27,15 @@ const UNKNOWN = 503;
const helmDeps =
[
'dcae-cloudify-manager',
- 'dcae-config-binding-service'
+ 'dcae-config-binding-service',
+ 'dcae-inventory-api',
+ 'dcae-servicechange-handler'
];
// List of deployments expected to be created by CM at boot time
const bootDeps =
[
'dep-deployment-handler',
- 'dep-inventory',
- 'dep-service-change-handler',
'dep-policy-handler',
'dep-dcae-ves-collector',
'dep-dcae-tca-analytics',
diff --git a/healthcheck-container/pom.xml b/healthcheck-container/pom.xml
index b768337..e728a66 100644
--- a/healthcheck-container/pom.xml
+++ b/healthcheck-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>healthcheck-container</artifactId>
<name>dcaegen2-deployments-healthcheck-container</name>
- <version>1.2.2</version>
+ <version>1.2.3</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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>