diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-10-04 17:27:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-04 17:27:15 +0000 |
| commit | c8c79af678e8ad916a3cc766acc0e931ea3184a2 (patch) | |
| tree | 6b6cee5eb9f616b110110645ec745b9b4c7630b1 | |
| parent | 79d2f504e49215df6d918ed7e96469f3f460f5c7 (diff) | |
| parent | d195e2a8c2afd1db514e0cad615c70200bbadf54 (diff) | |
Merge "Fix https config for admin portal"
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json | 10 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/values.yaml | 2 |
2 files changed, 6 insertions, 6 deletions
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 |