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

diff --git a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
index c513589100..a1a25be146 100755
--- a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
@@ -15,8 +15,9 @@
 */}}
 
 aai:
-  auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.server.aai.auth ) }}
-  endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  auth: {{ .Values.server.aai.auth }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
+  enabled: {{ .Values.global.aai.enabled }}
 logging:
   path: logs
 spring:
@@ -26,12 +27,17 @@ spring:
         password: ${ACTUATOR_PASSWORD}
         role: ACTUATOR
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
+multicloud:
+  endpoint: http://multicloud-k8s.{{ include "common.namespace" . }}:9015
 mso:
   site-name: localSite
-  logPath: ./logs/cnf
+  logPath: ./logs/cnf-adapter
   msb-ip: msb-iag.{{ include "common.namespace" . }}
   msb-port: 80
 #Actuator
@@ -47,4 +53,3 @@ management:
       prometheus:
         enabled: true # Whether exporting of metrics to Prometheus is enabled.
         step: 1m # Step size (i.e. reporting frequency) to use.
-