Merge "Update multicloud broker and openstack version"

[oom.git] / kubernetes / portal / charts / portal-app / templates / deployment.yaml

diff --git a/kubernetes/portal/charts/portal-app/templates/deployment.yaml b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
index fb9f35b..dc27fdb 100644 (file)
--- a/kubernetes/portal/charts/portal-app/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
@@ -55,7 +55,15 @@ spec:
           - ""
           - -n
           - ""
+          - -b
+          - "{{ .Values.global.env.tomcatDir }}"
         env:
+          - name: CATALINA_OPTS
+            value: >
+              -Djavax.net.ssl.keyStore={{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}}
+              -Djavax.net.ssl.keyStorePassword={{ .Values.global.trustpass }}
+              -Djavax.net.ssl.trustStore={{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}}
+              -Djavax.net.ssl.trustStorePassword={{ .Values.global.trustpass }}
           - name: javax.net.ssl.keyStore
             value: {{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}} 
           - name: javax.net.ssl.keyStorePassword