X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-oof-adapter%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=c58ba9196f35586725cad6dee06317b97239b39f;hb=refs%2Fheads%2Fmaster;hp=8db5d2678864cbeeee4af00fc54bc239ba5f10ae;hpb=664cb34eca555ba8f9cbaeb9224dd9af3afe802b;p=oom.git

diff --git a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
index 8db5d26788..c58ba9196f 100755
--- a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
@@ -25,6 +25,9 @@ spring:
         password: ${ACTUATOR_PASSWORD}
         role: ACTUATOR
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
@@ -36,17 +39,13 @@ mso:
   msb-port: 80
   msoKey: ${MSO_KEY}
   camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081
-  camundaAuth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.camundaAuth )}}
+  camundaAuth: {{ .Values.mso.camundaAuth }}
   workflow:
     message:
       endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
   oof:
     auth: ${OOF_LOGIN}:${OOF_PASSWORD}
-    {{ if (include "common.needTLS" .) }}
-    endpoint: https://oof-osdf.{{ include "common.namespace" . }}:8698
-    {{ else }}
     endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698
-    {{ end }}
 #Actuator
 management:
   endpoints: