Merge "[DMAAP] DMaaP ServiceMesh compatibility"

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

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 37024d4..0c2f679 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
@@ -16,7 +16,12 @@
 
 aai:
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.server.aai.auth ) }}
+  {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  {{ else }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  {{ end }}
+  enabled: {{ .Values.global.aai.enabled }}
 logging:
   path: logs
 spring:
@@ -29,10 +34,11 @@ server:
   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