From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 6 Jul 2020 07:33:40 +0000 (+0000)
Subject: Merge "[SO] Sync up with the last-minute MSB certificate changes."
X-Git-Tag: 7.0.0~372
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a5a772ced3c8e3bed52642ad5444f839fa01c034;hp=9b25ec98a6e10c0da3c51b1b347461defc1fabf4;p=oom.git

Merge "[SO] Sync up with the last-minute MSB certificate changes."
---

diff --git a/kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks b/kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks
index 9ebe9a8041..31ea6ba650 100644
Binary files a/kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks and b/kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks differ
diff --git a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
index 1166eab0c4..4128bc36ee 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
@@ -55,11 +55,11 @@ etsi-catalog-manager:
   vnfpkgm:
   {{- if .Values.global.msbEnabled }}
     endpoint: https://msb-iag:443/api/vnfpkgm/v1
-    http:
-      client:
-        ssl:
-          trust-store: ${TRUSTSTORE}
-          trust-store-password: ${TRUSTSTORE_PASSWORD}
+  http:
+    client:
+      ssl:
+        trust-store: ${TRUSTSTORE}
+        trust-store-password: ${TRUSTSTORE_PASSWORD}
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
   {{- end }}