X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-admin-cockpit%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=7657415f982c09d0bb32dd4601b17e9cc6db9c9e;hb=refs%2Fheads%2Fmaster;hp=dc9a4f2dadc5eba300c782e6c249025d4fb832a6;hpb=9e0814551cf6e87a553d9066c18854e02c71cea5;p=oom.git

diff --git a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
index dc9a4f2dad..7657415f98 100644
--- a/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/resources/config/overrides/override.yaml
@@ -3,21 +3,11 @@ server:
   forward-headers-strategy: none
   {{- end }}
   port: {{ index .Values.containerPort }}
-  {{- if .Values.global.aafEnabled }}
-  ssl:
-    keyStore: ${KEYSTORE}
-    keyStorePassword: ${KEYSTORE_PASSWORD}
-    trustStore: ${TRUSTSTORE}
-    trustStorePassword: ${TRUSTSTORE_PASSWORD}
-  {{- else }}
   ssl:
     enabled: false
-  {{- end }}
   tomcat:
     max-threads: 50
-  {{- if not .Values.global.aafEnabled }}
 ssl-enable: false
-  {{- end }}
 camunda:
   rest:
     api: