From: Piotr Darosz <piotr.darosz@nokia.com>
Date: Wed, 29 Aug 2018 12:27:02 +0000 (+0200)
Subject: OOM installation enable VID via HTTPS
X-Git-Tag: 3.0.0-ONAP~410^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=aca7aa533ca44bcd6b4083c25dc8e7a24b958856;p=oom.git

OOM installation enable VID via HTTPS

Enable OOM installation to allow Portal accessing VID via HTTPS.
Should be merged after https://gerrit.onap.org/r/#/c/63461/

Change-Id: If9f38d7a4bf54f62d9d7768e52d568c3d1536376
Issue-ID: VID-273
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
---

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 f6bd05f614..0c33ca6391 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
@@ -15,7 +15,7 @@ update fn_app set app_url = 'http://{{.Values.config.sdcFeHostName}}:{{.Values.c
 --pap => 8443:30219
 update fn_app set app_url = 'http://{{.Values.config.papHostName}}:{{.Values.config.papPort}}/onap/policy', app_rest_endpoint = 'http://pap:8443/onap/api/v2' where app_name = 'Policy';
 --vid => 8080:30200
-update fn_app set app_url = 'http://{{.Values.config.vidHostName}}:{{.Values.config.vidPort}}/vid/welcome.htm', app_rest_endpoint = 'http://vid:8080/vid/api/v2' where app_name = 'Virtual Infrastructure Deployment';
+update fn_app set app_url = 'https://{{.Values.config.vidHostName}}:{{.Values.config.vidPort}}/vid/welcome.htm', app_rest_endpoint = 'https://vid:8443/vid/api/v2' where app_name = 'Virtual Infrastructure Deployment';
 --sparky => TODO: sparky doesn't open a node port yet
 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
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index 0fb6c0e812..4d0192f391 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -43,7 +43,7 @@ config:
   papPort: "30219"
   # application's front end hostname.  Must be resolvable on the client side environment
   papHostName: "policy.api.simpledemo.onap.org"
-  # vid ui  assignment for port 8080
+  # vid ui  assignment for port 8443
   vidPort: "30200"
   # application's front end hostname.  Must be resolvable on the client side environment
   vidHostName: "vid.api.simpledemo.onap.org"
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 8487743177..074937db55 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -82,7 +82,7 @@ service:
   portName: vid
   externalPort: "00"
   nodePort: "00"
-  internalPort: 8080
+  internalPort: 8443
 
 ingress:
   enabled: false