Merge "[AAI] Make aai log level configurable"

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

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 9aafd4f..c58ba91 100755 (executable)
--- 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,24 +25,27 @@ spring:
         password: ${ACTUATOR_PASSWORD}
         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/oof
+  logPath: ./logs/oof-adapter
   msb-ip: msb-iag.{{ include "common.namespace" . }}
   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}
-    endpoint: https://oof-osdf.{{ include "common.namespace" . }}:8698
+    endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698
 #Actuator
 management:
   endpoints: