X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fcharts%2Fsdnc-portal%2Fresources%2Fconfig%2Fadmportal.json;h=e845e96b7f1dbf39b8c097bb34269cb52ee76ef5;hb=495adf303d8b1763e5350bedfe346ab40bc21ea4;hp=4c0754b691b3596c1a597356d74d5dcd2a046da9;hpb=95dd46311f15e3d004e821496e135e7b43faee4e;p=oom.git

diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
index 4c0754b691..e845e96b7f 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": "8843",
-  "ConexusNetworkPort": "8443",
+  "sslEnabled": "true",
+  "nonSslPort": "8543",
+  "ConexusNetworkPort": "{{.Values.service.internalPort}}",
   "AppNetworkPort": "8543",
   "clusterPort": "8443",
   "serviceHomingServiceType": "SDN-ETHERNET-INTERNET",
@@ -25,28 +25,28 @@
     "docker0": "172.17.0.1",
     "virbr0": "192.168.122.1"
   },
-  "svclogicPropertiesDb01": "/opt/onap/sdnc/data/properties/svclogic.properties.sdnctldb01",
+  "svclogicPropertiesDb01": "{{.Values.config.configDir}}/svclogic.properties.sdnctldb01",
   "databases": [
-    "dbhost|sdnctldb01"
+    "{{include "common.mariadbService" $}}|sdnc-sdnctldb01.{{.Release.Namespace}}"
   ],
   "dbFabricServer": "localhost",
   "dbFabricPort": "32275",
   "dbFabricGroupId": "hagroup1",
-  "dbFabricUser": "admin",
-  "dbFabricPassword": "admin",
-  "dbFabricDB": "mysql",
-  "dbUser": "sdnctl",
-  "dbPassword": "gamma",
-  "dbName": "sdnctl",
+  "dbFabricUser": "${DB_FABRIC_USER}",
+  "dbFabricPassword": "${DB_FABRIC_PASSWORD",
+  "dbFabricDB": "{{.Values.config.dbFabricDB}}",
+  "dbUser": "${SDNC_DB_USER}",
+  "dbPassword": "${SDNC_DB_PASSWORD}",
+  "dbName": "{{index $.Values "mariadb-galera" "config" "mysqlDatabase"}}",
   "odlProtocol": "http",
-  "odlHost": "sdnhost.{{.Release.Namespace}}",
-  "odlConexusHost": "sdnhost.{{.Release.Namespace}}",
+  "odlHost": "sdnc.{{.Release.Namespace}}",
+  "odlConexusHost": "sdnc.{{.Release.Namespace}}",
   "odlPort": "8181",
   "odlConexusPort": "8181",
-  "odlUser": "admin",
-  "odlPasswd": "admin",
-  "ConexusNetwork_sslCert": "",
-  "ConexusNetwork_sslKey": "",
+  "odlUser": "${ODL_USER}",
+  "odlPasswd": "${ODL_PASSWORD}",
+  "ConexusNetwork_sslCert": "{{.Values.config.storesDir}}/org.onap.sdnc.p12",
+  "ConexusNetwork_sslKey": "${KEYSTORE_PASSWORD}",
   "AppNetwork_sslCert": "",
   "AppNetwork_sslKey": "",
   "hostnameList": [