X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-catalog-db-adapter%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=d5a3aeff4453e6bfdafd104a358782da2dfe9c70;hb=ad61ccf6cccbe9a9637ef97eb98cee8dd70dce11;hp=f267d86b2942a6530790adf8e5977a0f219b9368;hpb=cf0dc5a8981899a22318bee7f07b34375906aceb;p=oom.git

diff --git a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml
index f267d86b29..d5a3aeff44 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-catalog-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");
@@ -11,7 +12,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*/}}
 server:
+    {{- if include "common.onServiceMesh" . }}
+    forward-headers-strategy: none
+    {{- end }}
     port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
@@ -19,14 +24,12 @@ ssl-enable: false
 mso:
   logPath: logs
   site-name: onapheat
-  config:
-    cadi: {{ include "so.cadi.keys" . | nindent 8}}
   catalog:
     db:
       spring:
         endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
   db:
-    auth:  {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.db.auth )}}
+    auth:  {{ .Values.mso.adapters.db.auth }}
 spring:
   datasource:
     hikari: