X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-etsi-sol005-adapter%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=c4d28c4ce9a4472e5ff5cc2764c7faf69614b4c9;hb=refs%2Fheads%2Fmaster;hp=e1e2fc23c67ec8cb07281dd2a89c9e9cabb4bf58;hpb=b4a66f9df15d8b10a31cf531ea6e8bf0bf1dd37a;p=oom.git

diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
index e1e2fc23c6..c4d28c4ce9 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
@@ -33,24 +33,21 @@ spring:
       password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
       role: ACTUATOR
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
 mso:
   site-name: localSite
   logPath: ./logs/etsi-sol005-adapter
-  config:
-    cadi: {{ include "so.cadi.keys" . | nindent 8}}
   msb-ip: msb-iag
   msb-port: 80
   adapters:
     requestDb:
-      {{ if (include "common.needTLS" .) }}
-      endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
-      {{ else }}
       endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
-      {{ end }}
-      auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
+      auth: {{ .Values.mso.adapters.requestDb.auth }}
 #Actuator
 management:
   security: