From: Timoney, Dan (dt5972) <dtimoney@att.com>
Date: Mon, 30 Sep 2019 19:27:54 +0000 (-0400)
Subject: Fix https config for admin portal
X-Git-Tag: 5.0.1-ONAP~22^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F96442%2F1;p=oom.git

Fix https config for admin portal

Fix config of admin portal to expose https instead of http

Change-Id: Ie5d94921fd0fdbe0ea4866385f07fa8859ba59a6
Issue-ID: OJSI-98
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---

diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
index 28da59ea29..8560ca1acc 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
@@ -2,9 +2,9 @@
   "MainMenu": "gamma",
   "dbConnLimit": "100",
   "home": "/opt/admportal",
-  "sslEnabled": "false",
-  "nonSslPort": "{{.Values.service.internalPort}}",
-  "ConexusNetworkPort": "8443",
+  "sslEnabled": "true",
+  "nonSslPort": "8543",
+  "ConexusNetworkPort": "{{.Values.service.internalPort}}",
   "AppNetworkPort": "8543",
   "clusterPort": "8443",
   "serviceHomingServiceType": "SDN-ETHERNET-INTERNET",
@@ -45,8 +45,8 @@
   "odlConexusPort": "8181",
   "odlUser": "admin",
   "odlPasswd": "{{.Values.config.odlPassword}}",
-  "ConexusNetwork_sslCert": "",
-  "ConexusNetwork_sslKey": "",
+  "ConexusNetwork_sslCert": "{{.Values.config.storesDir}}/org.onap.sdnc.p12",
+  "ConexusNetwork_sslKey": "{{.Values.config.keystorePwd}}",
   "AppNetwork_sslCert": "",
   "AppNetwork_sslKey": "",
   "hostnameList": [
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index 28db0d5836..8add0853e3 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -35,7 +35,7 @@ config:
   configDir: /opt/onap/sdnc/data/properties
   storesDir: /opt/onap/sdnc/data/stores
   odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-  keystorePwd: ?w5&!M;8v1XF;:Xd;g*%S$IY
+  keystorePwd: ff^G9D]yf&r}Ktum@BJ0YB?N
   mariadbGalera:
     chartName: mariadb-galera
     serviceName: mariadb-galera