diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-02-06 11:36:13 +0100 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-02-06 12:52:05 +0000 |
| commit | d25e509d471e0ef58da1a6b7691be0370197fcfa (patch) | |
| tree | e7799b2dd2fb7d7f52f2d98d4234321cf79be62b | |
| parent | bc4ccb78259dfeb32d412d017f5ab7c2db8452d9 (diff) | |
[SO] MSB connection fixed in nonTLS setup
In case of non-TLS setup the connection to the MSB (when MSB enabled)
needs to use the port 80 and does not need a SSL configuration
Issue-ID: OOM-3097
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I2f3828249fcf7865c15eac9dd014d9c29e7b094e
| -rw-r--r-- | kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml | 6 | ||||
| -rwxr-xr-x | kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml | 4 |
2 files changed, 7 insertions, 3 deletions
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 }} |