X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-appc-orchestrator%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=061d8f0847c90dc022440e95efa2b2b4fc87667b;hb=c78cc6b182237e2d39f894614f686144aa654a3c;hp=69178fd6c766bcbe792574bcc448f65721b6b9ce;hpb=2627db3364c949c6e45b55a7b8f408bb4da56948;p=oom.git

diff --git a/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml b/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
index 69178fd6c7..061d8f0847 100644
--- a/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/resources/config/overrides/override.yaml
@@ -15,6 +15,9 @@
 */}}
 
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
@@ -22,7 +25,7 @@ server:
 mso:
   logPath: ./logs/soappcorch
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.auth.rest.aafEncrypted "value2" .Values.mso.auth )}}
-  msoKey: {{ .Values.mso.msoKey }}
+  msoKey: {{ .Values.global.app.msoKey }}
   config:
     {{ if .Values.global.security.aaf.enabled }}
     cadi: {{ include "so.cadi.keys" . | nindent 8}}