From: Lusheng Ji <lji@research.att.com>
Date: Thu, 20 Feb 2020 14:55:42 +0000 (+0000)
Subject: Merge "Add DBaaS HA related deployment"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=90655071d9b91a32c885bac8c0a6220d6f2265c6;hp=e68e3142d1e247d8061f750c3da3ddbf4e51d630;p=ric-plt%2Fric-dep.git

Merge "Add DBaaS HA related deployment"
---

diff --git a/helm/a1mediator/values.yaml b/helm/a1mediator/values.yaml
index bc18f74..bfb3eda 100644
--- a/helm/a1mediator/values.yaml
+++ b/helm/a1mediator/values.yaml
@@ -1,6 +1,6 @@
 ################################################################################
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#   Copyright (c) 2019 Nokia.                                                  #
+#   Copyright (c) 2019-2020 AT&T Intellectual Property.                        #
+#   Copyright (c) 2019-2020 Nokia.                                             #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -25,7 +25,7 @@ a1mediator:
   imagePullPolicy: IfNotPresent
   image:
     name: ric-plt-a1
-    tag: 2.0.0
+    tag: 2.1.2
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
 
   # Service ports are now defined in
diff --git a/helm/e2mgr/templates/configmap.yaml b/helm/e2mgr/templates/configmap.yaml
index f9c9739..57ecf4f 100644
--- a/helm/e2mgr/templates/configmap.yaml
+++ b/helm/e2mgr/templates/configmap.yaml
@@ -122,12 +122,12 @@ data:
     {{- if hasKey .Values.e2mgr "keepAliveResponseTimeoutMs" }}
     keepAliveResponseTimeoutMs: {{ .Values.e2mgr.keepAliveResponseTimeoutMs }}
     {{- else }}
-    keepAliveResponseTimeoutMs: 4500
+    keepAliveResponseTimeoutMs: 360000
     {{- end }}
 
     {{- if hasKey .Values.e2mgr "keepAliveDelayMs" }}
     keepAliveDelayMs: {{ .Values.e2mgr.keepAliveDelayMs }}
     {{- else }}
-    keepAliveDelayMs: 1500
+    keepAliveDelayMs: 120000
     {{- end }}
 ---
diff --git a/helm/vespamgr/templates/deployment.yaml b/helm/vespamgr/templates/deployment.yaml
index ebb1828..6c9db0b 100644
--- a/helm/vespamgr/templates/deployment.yaml
+++ b/helm/vespamgr/templates/deployment.yaml
@@ -62,7 +62,7 @@ spec:
                 name: vespa-secrets
           env:
             - name: VESMGR_APPMGRDOMAIN
-              value: appmgr-service
+              value: {{ include "common.servicename.appmgr.http" . }}
           livenessProbe:
             httpGet:
               path: /supervision