From 454e2fd0872dfe433e3edacdf69fde523b32c5a0 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Fri, 6 Apr 2018 03:03:24 +0000 Subject: Correcting portal k8s configmap service names The service.name is really a port name and was being used wrong. Need a better way than this to get dependant chart names. This gets it working. Issue-ID: OOM-842 Change-Id: I6a78a5adb0e69524a90aa3386009a0d87ebed73c Signed-off-by: Mandeep Khinda --- .../config/deliveries/properties/ONAPPORTAL/system.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties') diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties index a11ffa04d2..765ba02b57 100755 --- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties +++ b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties @@ -1,6 +1,6 @@ #mysql db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb:failover://{{.Values.mariadb.service.name}}.{{.Release.Namespace}}:3306/portal +db.connectionURL = jdbc:mariadb:failover://{{.Release.Name}}-{{.Values.mariadb.chart.name}}.{{.Release.Namespace}}:3306/portal db.userName =root db.password =Aa123456 db.hib.dialect = org.hibernate.dialect.MySQLDialect @@ -82,7 +82,7 @@ notification_update_duration = 900 #Microservices Related Properties for Portal microservices.widget.protocol = http -microservices.widget.hostname = {{.Values.widget.service.name}}.{{.Release.Namespace}} +microservices.widget.hostname = {{.Release.Name}}-{{.Values.widget.chart.name}}.{{.Release.Namespace}} microservices.widget.username = widget_user microservices.widget.password = M+KcrCMVrR1rAxtiFE49n1uXC3FCkNBqFgeYsubEC/U= #This property won't be needed after consul is functional on VMs - -- cgit 1.2.3-korg