Merge "[DMAAP] DMaaP ServiceMesh compatibility"

[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 322fd41..7c1cb1b 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
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2020 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,11 +12,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*/}}
 
 aai:
   auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
   version: v19
+  {{ if (include "common.needTLS" .) }}
   endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  {{ else }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:8080
+  {{ end }}
 spring:
   datasource:
     hikari:
@@ -47,16 +53,20 @@ 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 }}
+    {{ if (include "common.needTLS" .) }}
     endpoint: https://msb-iag:443/api
+    {{ else }}
+    endpoint: http://msb-iag:443/api
+    {{ end }}
   http:
     client:
       ssl:
-        trust-store: ${TRUSTSTORE}
+        trust-store: file:${TRUSTSTORE}
         trust-store-password: ${TRUSTSTORE_PASSWORD}
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api