From ec86076d199ca317c2233a71d5f7a834d4d794e6 Mon Sep 17 00:00:00 2001
From: MukeshKumar <mukeshsharma@est.tech>
Date: Thu, 2 Jul 2020 12:41:04 +0100
Subject: [PATCH] [SO] Sync up with the last-minute MSB certificate changes.

JKS file for SO Sol003 adapter updated to reflect changes in MSB. White spaces removed in override file which caused issues.

Issue-ID: SO-2982
Change-Id: I78181cbba6fb1d785eb503bd1e9de5f9bb8a9b4a
Signed-off-by: Mukesh <mukeshsharma@est.tech>
---
 .../so-secrets/resources/certs/org.onap.so.trust.jks  | Bin 2344 -> 4641 bytes
 .../resources/config/overrides/override.yaml          |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

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 9ebe9a80413b2640fc6d27765803420b171d4316..31ea6ba650907cfa4747fb2ceb06398e613e29a7 100644
GIT binary patch
delta 1893
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

delta 42
wcmZ3evO<XG-`jt085kItKzJh$2d7A5N9*h5QOh$F+ox0?mV4#NF5;U707*&@ZU6uP

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 }}
-- 
2.16.6