summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-07-06 07:33:40 +0000
committerGerrit Code Review <gerrit@onap.org>2020-07-06 07:33:40 +0000
commita5a772ced3c8e3bed52642ad5444f839fa01c034 (patch)
treed6e8a8ae5b9e3c49c4b687badd113eb2f98deecb
parent9b25ec98a6e10c0da3c51b1b347461defc1fabf4 (diff)
parentec86076d199ca317c2233a71d5f7a834d4d794e6 (diff)
Merge "[SO] Sync up with the last-minute MSB certificate changes."
-rw-r--r--kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jksbin2344 -> 4641 bytes
-rwxr-xr-xkubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml10
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 9ebe9a8041..31ea6ba650 100644
--- 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
Binary files 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 }}