Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: set jasper database within master
configuration
......................................................................
packaging: setup: set jasper database within master configuration
Change-Id: I99c6712f51c46bd015b17ac10069e13ac3e33676
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/conf/jasper-master.properties.in
M packaging/legacy-setup/ovirt-engine-reports-setup.py
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/84/23784/1
diff --git a/packaging/conf/jasper-master.properties.in
b/packaging/conf/jasper-master.properties.in
index df02ffa..fadfa3d 100644
--- a/packaging/conf/jasper-master.properties.in
+++ b/packaging/conf/jasper-master.properties.in
@@ -14,9 +14,7 @@
dbPort=@REPORTS_DB_PORT@
dbUsername=@REPORTS_DB_USER@
dbPassword=@REPORTS_DB_PASSWORD@
-
-# JasperServer db name
-js.dbName=ovirtenginereports
+js.dbName=@REPORTS_DB_DATABASE@
# web app name
# (set one of these to deploy to a non-default war file name)
diff --git a/packaging/legacy-setup/ovirt-engine-reports-setup.py
b/packaging/legacy-setup/ovirt-engine-reports-setup.py
index 48bc041..4a0ea01 100755
--- a/packaging/legacy-setup/ovirt-engine-reports-setup.py
+++ b/packaging/legacy-setup/ovirt-engine-reports-setup.py
@@ -425,6 +425,7 @@
'@REPORTS_DB_PORT@': db_dict["port"],
'@REPORTS_DB_USER@': db_dict["username"],
'@REPORTS_DB_PASSWORD@': db_dict["password"],
+ '@REPORTS_DB_DATABASE@': JRS_DB_NAME,
},
)
--
To view, visit http://gerrit.ovirt.org/23784
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99c6712f51c46bd015b17ac10069e13ac3e33676
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
