Merge "Fix API gateway image issue"

diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index f97252a..ad1dac8 100644 (file)
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -16,6 +16,10 @@ spec:
      hostname: framework
      containers:
      - env:
+       - name: MSB_ADDR
+         value: "{{ .Values.msbgateway }}"
+       _ name: MSB_PORT
+         value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
          value: aai-service.{{ .Values.nsPrefix }}-aai
        - name: AAI_PORT

diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index 5da4f63..85a43a1 100644 (file)
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@ -16,6 +16,10 @@ spec:
      hostname: multicloud-vio
      containers:
      - env:
+       - name: MSB_ADDR
+         value: "{{ .Values.msbgateway }}"
+       - name: MSB_PORT
+         value: "{{ .Values.msbPort }}"
        - name: AAI_ADDR
          value: aai-service.{{ .Values.nsPrefix }}-aai
        - name: AAI_PORT

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 26f9592..2cbb377 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -5,3 +5,7 @@ image:
   readiness: oomk8s/readiness-check:1.0.0
   framework: nexus3.onap.org:10001/onap/multicloud/framework:latest
   vio: nexus3.onap.org:10001/onap/multicloud/vio:latest
+
+# domain name of msb gateway
+msbgateway: msb-iag.onap-msb
+msbPort: 80
\ No newline at end of file

diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index c8dcde1..610a699 100644 (file)
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcae' 'log' 'cli' 'multicloud')
+# Deploying MSB first and kube2msb last will ensure all the ONAP services can be registered to MSB
+HELM_APPS=('msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcae' 'log' 'cli' 'multicloud' 'kube2msb')
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
 ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker}