Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / so / components / so-etsi-nfvo-ns-lcm / resources / config / overrides / override.yaml

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index 6320a27..40f97ad 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@ -15,9 +15,9 @@
 */}}
 
 aai:
-  auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
+  auth: {{ .Values.aai.auth }}
   version: v19
-  endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
 spring:
   datasource:
     hikari:
@@ -41,6 +41,9 @@ spring:
       password: ${ETSI_NFVO_PASSWORD}
       role: ETSI-NFVO-Client
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ .Values.containerPort }}
   tomcat:
     max-threads: 50
@@ -49,17 +52,19 @@ mso:
 so:
   adapters:
     sol003-adapter:
-      url: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
+      url: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
       auth: {{ .Values.so.sol003.adapter.auth }}
 etsi-catalog-manager:
   base:
   {{- if .Values.global.msbEnabled }}
-    endpoint: https://msb-iag:443/api
-  http:
-    client:
-      ssl:
-        trust-store: ${TRUSTSTORE}
-        trust-store-password: ${TRUSTSTORE_PASSWORD}
+    endpoint: http://msb-iag:80/api
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api
   {{- end }}
+camunda:
+  bpm:
+    history-level: full
+    job-execution:
+      max-pool-size: 30
+      core-pool-size: 3
+      deployment-aware: true