From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Wed, 18 Dec 2019 11:33:04 +0000 (+0000)
Subject: Merge "VID: Remove VID_KEYSTORE_PASSWORD workaround"
X-Git-Tag: 6.0.0~467
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=aab7b218f456882edb50eb4b7f4358eadadb3df2;hp=8e28f7b7d9f32e3c472a717a8a8c7874e5724f8b;p=oom.git

Merge "VID: Remove VID_KEYSTORE_PASSWORD workaround"
---

diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 2c6c5facdc..3c52b9d03f 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -96,8 +96,6 @@ spec:
               value: "{{ .Values.config.vidcontactuslink }}"
             - name: VID_KEYSTORE_PASSWORD
               value: {{ .Values.config.vidkeystorepassword | quote }}
-            - name: CATALINA_OPTS
-              value: "-Dvid.keystore.password=$(VID_KEYSTORE_PASSWORD) -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=/opt/app/vid/etc/org.onap.vid.jks -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp"
             - name: VID_UEB_URL_LIST
               value: message-router.{{ include "common.namespace" . }}
             - name: VID_MYSQL_HOST