VID: Remove VID_KEYSTORE_PASSWORD workaround 48/99648/1
authorIttay Stern <ittay.stern@att.com>
Sun, 15 Dec 2019 11:01:51 +0000 (13:01 +0200)
committerIttay Stern <ittay.stern@att.com>
Sun, 15 Dec 2019 11:01:51 +0000 (13:01 +0200)
Workaround is no longer needed, after CATALINA_OPTS
parameters are late-evaluated.

See commit https://gerrit.onap.org/r/c/vid/+/99583 (change
id Ife2a2e92b3745691cc45590d1afd1688d918048f).

Issue-ID: VID-650

Change-Id: Ibb27d050632e8ce9b96da6e4033840380d1f3f72
Signed-off-by: Ittay Stern <ittay.stern@att.com>
kubernetes/vid/templates/deployment.yaml

index 2c6c5fa..3c52b9d 100644 (file)
@@ -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