aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/cps/components/cps-core/values.yaml2
-rw-r--r--kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml6
-rwxr-xr-xkubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml4
3 files changed, 8 insertions, 4 deletions
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 }}