summaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/charts/policy-common/resources/config
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 07:56:27 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-04-24 13:23:19 +0000
commit1ffbd99a2757af8e10d0f6af46177c646364f91b (patch)
treeceb97b36e0e6ae50349f6495dc585b4ebd61d3f6 /kubernetes/policy/charts/policy-common/resources/config
parent23a95a751a002163f61cb7eafb4dc84465415daa (diff)
Make all services independent of helm Release.Name
Issue-ID: OOM-906 Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/policy/charts/policy-common/resources/config')
-rw-r--r--kubernetes/policy/charts/policy-common/resources/config/pe/base.conf4
-rw-r--r--kubernetes/policy/charts/policy-common/resources/config/scripts/do-start.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf
index 4549406f76..ce8a0306a4 100644
--- a/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf
+++ b/kubernetes/policy/charts/policy-common/resources/config/pe/base.conf
@@ -18,8 +18,8 @@ POLICY_LOGS=/var/log/onap
KEYSTORE_PASSWD=Pol1cy_0nap
JDBC_DRIVER=org.mariadb.jdbc.Driver
-JDBC_URL=jdbc:mariadb://{{ .Release.Name }}-{{ .Values.global.mariadb.nameOverride }}:{{.Values.config.mariadbPort}}/onap_sdk?failOverReadOnly=false&autoReconnect=true
-JDBC_LOG_URL=jdbc:mariadb://{{ .Release.Name }}-{{ .Values.global.mariadb.nameOverride }}:{{.Values.config.mariadbPort}}/log?failOverReadOnly=false&autoReconnect=true
+JDBC_URL=jdbc:mariadb://{{ .Values.global.mariadb.nameOverride }}:{{.Values.config.mariadbPort}}/onap_sdk?failOverReadOnly=false&autoReconnect=true
+JDBC_LOG_URL=jdbc:mariadb://{{ .Values.global.mariadb.nameOverride }}:{{.Values.config.mariadbPort}}/log?failOverReadOnly=false&autoReconnect=true
JDBC_USER=policy_user
JDBC_PASSWORD=policy_user
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 35842e4859..defae52b4b 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
@@ -74,7 +74,7 @@ else
# (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=))
- db_upgrade_remote.sh $dbuser $dbpw {{.Release.Name}}-{{.Values.global.mariadb.nameOverride}}
+ db_upgrade_remote.sh $dbuser $dbpw {{.Values.global.mariadb.nameOverride}}
fi
fi