X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-etsi-nfvo-ns-lcm%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=40f97ad69fbcca92d92c3f8a8e131e60f66b4bce;hb=refs%2Fheads%2Fmaster;hp=7c1cb1b3c489748d03ff7617d9bf6c56eb858184;hpb=664cb34eca555ba8f9cbaeb9224dd9af3afe802b;p=oom.git

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 7c1cb1b3c4..40f97ad69f 100644
--- 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,13 +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
-  {{ if (include "common.needTLS" .) }}
-  endpoint: https://aai.{{ include "common.namespace" . }}:8443
-  {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
-  {{ end }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
 spring:
   datasource:
     hikari:
@@ -45,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
@@ -58,16 +57,7 @@ so:
 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: file:${TRUSTSTORE}
-        trust-store-password: ${TRUSTSTORE_PASSWORD}
+    endpoint: http://msb-iag:80/api
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api
   {{- end }}