From b3005d3ffd37f3e76fc64f5da92689b707288a22 Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Fri, 19 Oct 2018 04:54:43 +0000 Subject: Fix MSB Portal integration mapping Change-Id: Ie83c1c07c110af14c9b9af30d4e663b26683a456 Issue-ID: MSB-293 Signed-off-by: Huabing Zhao --- .../charts/portal-mariadb/resources/config/mariadb/oom_updates.sql | 4 ++-- kubernetes/portal/charts/portal-mariadb/values.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql b/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql index 6b9e8a957c..b7782a98c1 100644 --- a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql +++ b/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql @@ -37,5 +37,5 @@ update fn_app set app_url = 'https://{{.Values.config.vidHostName}}:{{.Values.co update fn_app set app_url = 'http://{{.Values.config.aaiSparkyHostName}}:{{.Values.config.aaiSparkyPort}}/services/aai/webapp/index.html#/viewInspect', app_rest_endpoint = 'http://aai-sparky-be.{{.Release.Namespace}}:9517/api/v2' where app_name = 'A&AI UI'; --cli => 8080:30260 update fn_app set app_url = 'http://{{.Values.config.cliHostName}}:{{.Values.config.cliPort}}/', app_type = 1 where app_name = 'CLI'; ---msb-discovery => 10081:30281 this is clearly incorrect -update fn_app set app_url = 'http://{{.Values.config.msbDiscoveryHostName}}:{{.Values.config.msbDiscoveryPort}}/iui/microservices/default.html' where app_name = 'MSB'; +--msb-iag => 80:30280 +update fn_app set app_url = 'http://{{.Values.config.msbHostName}}:{{.Values.config.msbPort}}/iui/microservices/default.html' where app_name = 'MSB'; diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml index 8f6122f971..0579f278f8 100644 --- a/kubernetes/portal/charts/portal-mariadb/values.yaml +++ b/kubernetes/portal/charts/portal-mariadb/values.yaml @@ -64,10 +64,10 @@ config: dmaapBcPort: "" # TODO: populate with # application's front end hostname. Must be resolvable on the client side environment dmaapBcHostName: "dmaap-bc.simpledemo.onap.org" - # msb discovery ui assignment for port ? - msbDiscoveryPort: "30281" + # msb IAG ui assignment for port 80 + msbPort: "30280" # application's front end hostname. Must be resolvable on the client side environment - msbDiscoveryHostName: "msb.api.discovery.simpledemo.onap.org" + msbHostName: "msb.api.simpledemo.onap.org" # default number of instances replicaCount: 1 -- cgit 1.2.3-korg