Merge "Change port mapping on DMaaP DR prov"

diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 2dd1c16..2399dc3 100644 (file)
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -20,9 +20,9 @@ available), follow the following instructions to deploy ONAP.
   > git clone -b <BRANCH> http://gerrit.onap.org/r/oom --recurse-submodules
   > cd oom/kubernetes
 
-where <BRANCH> is offical release tag, such as
+where <BRANCH> can be an offical release tag, such as
 4.0.0-ONAP for Dublin
-5.0.0-ONAP for El Alto
+5.0.1-ONAP for El Alto
 
 **Step 2.** Install Helm Plugins required to deploy ONAP::
 

diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index f078bd1..e568996 100644 (file)
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -37,7 +37,7 @@ debugEnabled: false
 config:
   cluster_domain: cluster.local
   heap:
-    max: 512M
+    max: 2048M
     min: 100M
   jvmOpts: -Dcassandra.consistent.rangemovement=false
   clusterName: cassandra

diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml
index 2d4360c..3062e4e 100644 (file)
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@ -95,11 +95,24 @@ portal:
     readiness:
       initialDelaySeconds: 60
 sdc:
+  sdc-fe:
+    liveness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
+    readiness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-cs:
     liveness:
       initialDelaySeconds: 120
@@ -107,14 +120,18 @@ sdc:
       initialDelaySeconds: 120
   sdc-es:
     liveness:
-      initialDelaySeconds: 60
+      initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
   sdc-onboarding-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
 sdnc:
   liveness:
     initialDelaySeconds: 60

diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 75ce8e5..2788e24 100644 (file)
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -157,11 +157,24 @@ portal:
     readiness:
       periodSeconds: 60
 sdc:
+  sdc-fe:
+    liveness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
+    readiness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-cs:
     liveness:
       initialDelaySeconds: 120
@@ -177,8 +190,12 @@ sdc:
   sdc-onboarding-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
 sdnc:
   liveness:
     initialDelaySeconds: 60

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/resources/config/optimizer.properties b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/resources/config/optimizer.properties
index 6b72dd4..32636f4 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/resources/config/optimizer.properties
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/resources/config/optimizer.properties
@@ -53,6 +53,11 @@ cmso.minizinc.command.mzn=scripts/minizinc/generic_attributes.mzn
 mechid.user=oof@oof.onap.org
 mechid.pass=enc:vfxQdJ1mgdcI7S6SPrzNaw==
 
+aaf.urls=https://aaf-locate:8095
+aaf.user.role.properties=/share/etc/certs/AAFUserRoles.properties
+aaf.enabled=true
+aaf.namespace=org.onap.oof
+
 cadi_loglevel=DEBUG
 cadi_prop_files=/share/etc/certs/org.onap.oof.props
 aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
\ No newline at end of file

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml
index 096332b..af56717 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/values.yaml
@@ -25,12 +25,12 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-optimizer:2.0.0
+image: onap/optf-cmso-optimizer:2.1.1
 pullPolicy: Always
 
 #init container image
 dbinit:
-  image: onap/optf-cmso-dbinit:2.0.0
+  image: onap/optf-cmso-dbinit:2.1.1
 
 # flag to enable debugging - application support required
 debugEnabled: false
@@ -54,7 +54,7 @@ liveness:
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 120
   periodSeconds: 10
 
 

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/cmso.properties b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/cmso.properties
index c6c93ed..68b3688 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/cmso.properties
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/cmso.properties
@@ -102,6 +102,11 @@ mechid.pass=enc:vfxQdJ1mgdcI7S6SPrzNaw==
 
 cmso.dispatch.url=http://localhost:8089
 
+aaf.urls=https://aaf-locate:8095
+aaf.user.role.properties=/share/etc/certs/AAFUserRoles.properties
+aaf.enabled=true
+aaf.namespace=org.onap.oof
+
 cadi_loglevel=DEBUG
 cadi_prop_files=/share/etc/certs/org.onap.oof.props
 aaf.user.roles=/share/etc/certs/AAFUserRoles.properties

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/mock.py b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/mock.py
deleted file mode 100644 (file)
index b678a4e..0000000
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/mock.py
+++ /dev/null
@@ -1,83 +0,0 @@
- # -------------------------------------------------------------------------
- #   Copyright (c) 2019 AT&T Intellectual Property
- #
- #   Licensed under the Apache License, Version 2.0 (the "License");
- #   you may not use this file except in compliance with the License.
- #   You may obtain a copy of the License at
- #
- #       http://www.apache.org/licenses/LICENSE-2.0
- #
- #   Unless required by applicable law or agreed to in writing, software
- #   distributed under the License is distributed on an "AS IS" BASIS,
- #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- #   See the License for the specific language governing permissions and
- #   limitations under the License.
- #
- # -------------------------------------------------------------------------
- #
-
-from flask import Flask
-from flask import request
-from flask import Response
-from flask import json
-from flask import send_from_directory
-import requests
-from threading import Thread
-import time
-
-import os
-import fnmatch
-import re
-import time
-import datetime
-
-app = Flask(__name__)
-ROOT_MOCK_DIR = os.path.dirname(os.path.abspath(__file__))
-DATA_DIR =   os.path.join(ROOT_MOCK_DIR, "data")
-global requestNum
-requestNum = 1
-
-########################################################################
-########################################################################
-@app.route('/onap/so/infra/orchestrationRequests/v7/schedule/<VNFNAME>', methods=['GET', 'POST'])
-def soSchedule(VNFNAME):
-    if request.method == 'POST':
-        testid = request.headers.environ["HTTP_X_TRANSACTIONID"]
-        response = {
-            "status" : "202",
-            "entity" : {
-                "requestReferences" : {
-                    "requestId" : "000001"
-                    }
-                }
-            }
-        resp = Response(json.dumps(response), 200, mimetype='application/json')
-        return resp
-
-
-    else :
-        return "Helloooooo!!!!"
-
-########################################################################
-########################################################################
-@app.route('/onap/so/infra/orchestrationRequests/v7/<REQUESTID>', methods=['GET'])
-def soStatus(REQUESTID):
-    response = {"request" : { "requestStatus" : {
-        "requestState" : "COMPLETE",
-        "statusMessage" : "Done.",
-        "percentProgress" : 100,
-        "finishTime" : ""
-        }}}
-    now = datetime.datetime.utcnow()
-    #response["finishTime"] = now.strftime("%Y-%m-%dT%H:%M:%SZ")
-    response["request"]["requestStatus"]["finishTime"] = now.strftime("%a, %d %b %Y %H:%M:%S GMT")
-    resp = Response(json.dumps(response), 200, mimetype='application/json')
-
-    return resp
-
-########################################################################
-########################################################################
-if __name__ == "__main__":
-    app.run(host= '0.0.0.0',port=5000)
-    #app.run()
-

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh
deleted file mode 100644 (file)
index c87a26b..0000000
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-pip install flask
-pip install requests
-python /share/etc/config/mock.py

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
index b26f6dd..1b17ed2 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml
@@ -84,16 +84,11 @@ spec:
         resources:
 {{ include "common.resources" . }}
       - name: mso-simulator
-        image: "{{ .Values.global.pythonRepository }}/{{ .Values.global.pythonImage }}"
+        image: "{{ include "common.repository" . }}/{{ .Values.robotimage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - name: {{ include "common.fullname" . }}-config
           mountPath: /share/etc/config
-        command:
-        - /bin/sh
-        args:
-        - -x
-        - /share/etc/config/msosimulator.sh
         ports:
         - containerPort: 5000        
         resources:
@@ -179,10 +174,6 @@ spec:
               path: ticketmgt.properties
             - key: liquibase.properties
               path: liquibase.properties
-            - key: mock.py
-              path: mock.py
-            - key: msosimulator.sh
-              path: msosimulator.sh
         - name:  {{ include "common.fullname" . }}-logs
           emptyDir: {}
         - name: {{ include "common.fullname" . }}-filebeat

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml
index 3dad361..85f6094 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/values.yaml
@@ -19,20 +19,19 @@ global: # global defaults
   nodePortPrefix: 302
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.0
-  pythonRepository: library
-  pythonImage: python:3.6-alpine
 
 subChartsOnly:
   enabled: true
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-service:2.0.0
+image: onap/optf-cmso-service:2.1.1
+robotimage: onap/optf-cmso-robot:2.1.1
 pullPolicy: Always
 
 #init container image
 dbinit:
-  image: onap/optf-cmso-dbinit:2.0.0
+  image: onap/optf-cmso-dbinit:2.1.1
 
 # flag to enable debugging - application support required
 debugEnabled: false
@@ -56,7 +55,7 @@ liveness:
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 120
   periodSeconds: 10
 
 

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/resources/config/ticketmgt.properties b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/resources/config/ticketmgt.properties
index d687ab3..e8fb5b6 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/resources/config/ticketmgt.properties
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/resources/config/ticketmgt.properties
@@ -30,4 +30,9 @@
 #-------------------------------------------------------------------------------
 cadi_loglevel=DEBUG
 cadi_prop_files=/share/etc/certs/org.onap.oof.props
-aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
\ No newline at end of file
+aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
+
+aaf.urls=https://aaf-locate:8095
+aaf.user.role.properties=/share/etc/certs/AAFUserRoles.properties
+aaf.enabled=true
+aaf.namespace=org.onap.oof
\ No newline at end of file

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml
index 7d093c1..300a72c 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/values.yaml
@@ -26,7 +26,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-ticketmgt:2.0.0
+image: onap/optf-cmso-ticketmgt:2.1.1
 pullPolicy: Always
 
 
@@ -52,7 +52,7 @@ liveness:
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 120
   periodSeconds: 10
 
 

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/resources/config/topology.properties b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/resources/config/topology.properties
index d687ab3..e8fb5b6 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/resources/config/topology.properties
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/resources/config/topology.properties
@@ -30,4 +30,9 @@
 #-------------------------------------------------------------------------------
 cadi_loglevel=DEBUG
 cadi_prop_files=/share/etc/certs/org.onap.oof.props
-aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
\ No newline at end of file
+aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
+
+aaf.urls=https://aaf-locate:8095
+aaf.user.role.properties=/share/etc/certs/AAFUserRoles.properties
+aaf.enabled=true
+aaf.namespace=org.onap.oof
\ No newline at end of file

diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml
index dc8040e..c8ac5d7 100644 (file)
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/values.yaml
@@ -25,7 +25,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-cmso-topology:2.0.0
+image: onap/optf-cmso-topology:2.1.1
 pullPolicy: Always
 
 
@@ -51,7 +51,7 @@ liveness:
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 120
   periodSeconds: 10
 
 

diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
index 62dffd6..ee4da9b 100644 (file)
--- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
@@ -73,12 +73,14 @@ spec:
               port: {{ .Values.service.internalPort2 }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           {{ end }}
           readinessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort2 }}
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           resources:
 {{ include "common.resources" . | indent 12 }}
           env:

diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml
index 6831555..8878f1a 100644 (file)
--- a/kubernetes/sdc/charts/sdc-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/values.yaml
@@ -51,14 +51,16 @@ affinity: {}
 # probe configuration parameters
 liveness:
   initialDelaySeconds: 10
-  periodSeconds: 10
+  periodSeconds: 60
+  timeoutSeconds: 15
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
   initialDelaySeconds: 10
-  periodSeconds: 10
+  periodSeconds: 60
+  timeoutSeconds: 15
 
 service:
   #Example service definition with external, internal and node ports.

diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
index 70895d3..dee139b 100644 (file)
--- a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
@@ -60,6 +60,7 @@ spec:
               - "/var/lib/ready-probe.sh"
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           {{ end }}
           readinessProbe:
             exec:
@@ -67,6 +68,7 @@ spec:
               - "/var/lib/ready-probe.sh"
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           resources:
 {{ include "common.resources" . | indent 12 }}
           env:

diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
index ce04d48..a6a3f6b 100644 (file)
--- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
@@ -48,15 +48,17 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 60
-  periodSeconds: 10
+  initialDelaySeconds: 120
+  periodSeconds: 60
+  timeoutSeconds: 15
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 60
-  periodSeconds: 10
+  initialDelaySeconds: 120
+  periodSeconds: 60
+  timeoutSeconds: 15
 
 service:
   type: ClusterIP

diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
index 28da59e..8560ca1 100644 (file)
--- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
@@ -2,9 +2,9 @@
   "MainMenu": "gamma",
   "dbConnLimit": "100",
   "home": "/opt/admportal",
-  "sslEnabled": "false",
-  "nonSslPort": "{{.Values.service.internalPort}}",
-  "ConexusNetworkPort": "8443",
+  "sslEnabled": "true",
+  "nonSslPort": "8543",
+  "ConexusNetworkPort": "{{.Values.service.internalPort}}",
   "AppNetworkPort": "8543",
   "clusterPort": "8443",
   "serviceHomingServiceType": "SDN-ETHERNET-INTERNET",
@@ -45,8 +45,8 @@
   "odlConexusPort": "8181",
   "odlUser": "admin",
   "odlPasswd": "{{.Values.config.odlPassword}}",
-  "ConexusNetwork_sslCert": "",
-  "ConexusNetwork_sslKey": "",
+  "ConexusNetwork_sslCert": "{{.Values.config.storesDir}}/org.onap.sdnc.p12",
+  "ConexusNetwork_sslKey": "{{.Values.config.keystorePwd}}",
   "AppNetwork_sslCert": "",
   "AppNetwork_sslKey": "",
   "hostnameList": [

diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index 28db0d5..8add085 100644 (file)
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -35,7 +35,7 @@ config:
   configDir: /opt/onap/sdnc/data/properties
   storesDir: /opt/onap/sdnc/data/stores
   odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-  keystorePwd: ?w5&!M;8v1XF;:Xd;g*%S$IY
+  keystorePwd: ff^G9D]yf&r}Ktum@BJ0YB?N
   mariadbGalera:
     chartName: mariadb-galera
     serviceName: mariadb-galera