From: Konrad Bańka <k.banka@samsung.com>
Date: Wed, 29 Apr 2020 17:31:03 +0000 (+0200)
Subject: [so][msb] Update MSB url to match with its certificate
X-Git-Tag: 7.0.0~416^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9755aadf7f86d65db50c3193b984c8f76536c54f;hp=88cf4965828fa7f17e413a4465844e200d1358df;p=oom.git

[so][msb] Update MSB url to match with its certificate

Change tested on so-openstack-adapter but it should impact each
subcomponent the same way.

Issue-ID: MSB-467
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I3f2ffef25b614701b23aeb9b248db24eee671188
---

diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
index 8c21a99ac1..e57ea34f43 100755
--- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -45,7 +45,7 @@ pnf:
     consumerId: consumerId
     topicListenerDelayInSeconds: 5
 bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081
-msb-ip: msb-iag.{{ include "common.namespace" . }}
+msb-ip: msb-iag
 msb-port: 80
 mso:
   rainyDay:
diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
index 3ecf3f50b3..dde3b3ee63 100755
--- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -102,7 +102,7 @@ mso:
       auth: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.db.auth )}}
   auth: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.encrypted "value2" .Values.mso.auth )}}
   logPath: ./logs/openstack
-  msb-ip: msb-iag.{{ include "common.namespace" . }}
+  msb-ip: msb-iag
   msb-port: 443
   msb-scheme: https
   workflow:
diff --git a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
index ea61f502f2..dec34485bc 100755
--- a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
@@ -39,7 +39,7 @@ mso:
   logPath: ./logs/vfc
   config:
     cadi: {{ include "cadi.keys" . | nindent 8}}
-  msb-ip: msb-iag.{{ include "common.namespace" . }}
+  msb-ip: msb-iag
   msb-port: 80
   adapters:
     requestDb:
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 10846cf7fa..1166eab0c4 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
@@ -42,7 +42,7 @@ mso:
   logPath: ./logs/vnfm-adapter
   config:
     cadi: {{ include "cadi.keys" . | nindent 8}}
-  msb-ip: msb-iag.{{ include "common.namespace" . }}
+  msb-ip: msb-iag
   msb-port: 80
 sdc:
   username: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.username "value2" .Values.sdc.username )}}
@@ -54,7 +54,7 @@ vnfmadapter:
 etsi-catalog-manager:
   vnfpkgm:
   {{- if .Values.global.msbEnabled }}
-    endpoint: https://msb-iag.{{ include "common.namespace" . }}:443/api/vnfpkgm/v1
+    endpoint: https://msb-iag:443/api/vnfpkgm/v1
     http:
       client:
         ssl: