Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / so / components / so-request-db-adapter / resources / config / overrides / override.yaml

diff --git a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
index 089d80c..7ea7749 100755 (executable)
--- a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 AT&T USA
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # will be used as entry in DB to say SITE OFF/ON for healthcheck
+*/}}
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
@@ -20,11 +25,9 @@ ssl-enable: false
 mso:
   logPath: logs
   site-name: localSite
-  config:
-    cadi: {{- include "so.cadi.keys" . | nindent 8}}
   adapters:
     requestDb:
-      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 }}
       endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
 spring:
   datasource: