[HOLMES] Fixed the healthcheck failure

Fixed the healthcheck failure occurred  in the auto-tests.

Issue-ID: HOLMES-512
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I2e3d89b8dc8b27412008ca36f1e6209a47a997db

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
index aef0c8c..dd7bb45 100644 (file)
--- a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
@@ -95,8 +95,12 @@ spec:
           value: consul-server.{{ include "common.namespace" . }}
         - name: CONFIG_BINDING_SERVICE
           value: config-binding-service
-        - name: msb_hostname
-          value: "msb-iag.onap"
+        - name: MSB_IAG_SERVICE_PROTOCOL
+          value: {{ .Values.global.msbProtocol }}
+        - name: MSB_IAG_SERVICE_HOST
+          value: {{ .Values.global.msbServiceName }}.{{ include "common.namespace" . }}
+        - name: MSB_IAG_SERVICE_PORT
+          value: {{ .Values.global.msbPort | quote }}
         - name: POD_IP
           valueFrom:
             fieldRef:

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index d9dfa2d..c8ec225 100644 (file)
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -20,12 +20,15 @@
 #################################################################
 global:
   nodePortPrefixExt: 302
+  msbProtocol: https
+  msbServiceName: msb-iag
+  msbPort: 443
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/holmes/engine-management:10.0.0
+image: onap/holmes/engine-management:10.0.2
 consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
 
 #################################################################

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index f3e9ce5..21a9656 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -93,8 +93,12 @@ spec:
           value: consul-server.{{ include "common.namespace" . }}
         - name: CONFIG_BINDING_SERVICE
           value: config-binding-service
-        - name: msb_hostname
-          value: "msb-iag.onap"
+        - name: MSB_IAG_SERVICE_PROTOCOL
+          value: {{ .Values.global.msbProtocol }}
+        - name: MSB_IAG_SERVICE_HOST
+          value: {{ .Values.global.msbServiceName }}.{{ include "common.namespace" . }}
+        - name: MSB_IAG_SERVICE_PORT
+          value: {{ .Values.global.msbPort | quote}}
         - name: POD_IP
           valueFrom:
             fieldRef:

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index d26e88d..9407619 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -20,12 +20,15 @@
 #################################################################
 global:
   nodePortPrefixExt: 302
+  msbProtocol: https
+  msbServiceName: msb-iag
+  msbPort: 443
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/holmes/rule-management:10.0.0
+image: onap/holmes/rule-management:10.0.2
 consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
 
 #################################################################