From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Mon, 13 Feb 2023 13:39:36 +0000 (+0000)
Subject: Merge "[SO] Config Changes for SO to listen to a new DMaap Topic"
X-Git-Tag: 12.0.0~122
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0b0c1bc55083b5b6e8f08b0b1189fb600357188d;hp=f4926187219df7e17b0f7ef992930345d7f65131;p=oom.git

Merge "[SO] Config Changes for SO to listen to a new DMaap Topic"
---

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 8e5e314aca..5f420d1a4d 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -75,7 +75,7 @@ global:
     container:
       name: postgres
 
-image: onap/cps-and-ncmp:3.1.5
+image: onap/cps-and-ncmp:3.2.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
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 df47c0a5fd..cc668fbd70 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
@@ -63,14 +63,14 @@ etsi-catalog-manager:
   {{- 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}
+    {{ else }}
+    endpoint: http://msb-iag:80/api
+    {{ end }}
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api
   {{- end }}
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
index fed38f7592..e6a3d7c8ac 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
@@ -59,12 +59,16 @@ vnfmadapter:
 etsi-catalog-manager:
   vnfpkgm:
   {{- if .Values.global.msbEnabled }}
+    {{ if (include "common.needTLS" .) }}
     endpoint: https://msb-iag:443/api/vnfpkgm/v1
   http:
     client:
       ssl:
         trust-store: file:${TRUSTSTORE}
         trust-store-password: ${TRUSTSTORE_PASSWORD}
+    {{ else }}
+    endpoint: http://msb-iag:80/api
+    {{ end }}
   {{- else }}
     endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
   {{- end }}