From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 1 Apr 2020 06:03:24 +0000 (+0000)
Subject: Merge "[POLICY] Allow to override username and password from env"
X-Git-Tag: 6.0.0~220
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=64e622c75a90be63a55e5b87240084f0a7466633;hp=39690f2a3291bb70c6d64f2bb1f4216eeafcf7ba;p=oom.git

Merge "[POLICY] Allow to override username and password from env"
---

diff --git a/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh b/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh
index 052b6f2c2f..0e473105a2 100644
--- a/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh
+++ b/kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh
@@ -78,8 +78,17 @@ else
 		# wait for DB up
 		# now that DB is up, invoke database upgrade
 		# (which does nothing if the db is already up-to-date)
-		dbuser=$(echo $(grep '^JDBC_USER=' base.conf | cut -f2 -d=))
-		dbpw=$(echo $(grep '^JDBC_PASSWORD=' base.conf | cut -f2 -d=))
+		if [[ -v JDBC_USER ]]; then
+			dbuser=${JDBC_USER};
+		else
+			dbuser=$(echo $(grep '^JDBC_USER=' base.conf | cut -f2 -d=))
+		fi
+
+		if [[ -v JDBC_PASSWORD ]]; then
+			dbpw=${JDBC_PASSWORD}
+		else
+			dbpw=$(echo $(grep '^JDBC_PASSWORD=' base.conf | cut -f2 -d=))
+		fi
 		db_upgrade_remote.sh $dbuser $dbpw {{.Values.global.mariadb.service.name}}
 	fi