Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: do not Reports.xml write into /usr
......................................................................
packaging: setup: do not Reports.xml write into /usr
engine is now expecting reports.xml at /var/lib.
Change-Id: I194ee092bffb7b88995b0312172a5a7b88a3033d
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/ovirt-engine-reports-setup.py
M packaging/ovirt-engine-reports.spec.in
2 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/69/23269/1
diff --git a/packaging/ovirt-engine-reports-setup.py
b/packaging/ovirt-engine-reports-setup.py
index 77ec763..3ea5011 100755
--- a/packaging/ovirt-engine-reports-setup.py
+++ b/packaging/ovirt-engine-reports-setup.py
@@ -1173,11 +1173,8 @@
#Run post setup steps - disable unused users, set theme,
change superuser password if needed
configureRepository(adminPass)
- # Copy reports xml to webadmin folder
- webadminFolder = "%s/engine.ear/webadmin.war/" % DIR_DEPLOY
- if not os.path.exists(webadminFolder):
- os.makedirs(webadminFolder)
- shutil.copy2("%s/Reports.xml" % REPORTS_PACKAGE_DIR,
webadminFolder)
+ # Copy reports xml to engine
+ shutil.copy2("%s/Reports.xml" % REPORTS_PACKAGE_DIR,
'/var/lib/ovirt-engine/reports.xml')
# Delete default properties files
if os.path.exists(FILE_JASPER_DB_CONN):
diff --git a/packaging/ovirt-engine-reports.spec.in
b/packaging/ovirt-engine-reports.spec.in
index 4088e08..9bf7f25 100644
--- a/packaging/ovirt-engine-reports.spec.in
+++ b/packaging/ovirt-engine-reports.spec.in
@@ -115,9 +115,7 @@
if [ -f /etc/ovirt-engine/jrs-deployment.version ]; then
rm -rf /etc/ovirt-engine/jrs-deployment.version
fi
- if [ -f
/usr/share/ovirt-engine/engine.ear/webadmin.war/webadmin/Reports.xml ]; then
- rm -rf
/usr/share/ovirt-engine/engine.ear/webadmin.war/webadmin/Reports.xml
- fi
+ rm -f /var/lib/ovirt-engine/reports.xml
fi
%files
--
To view, visit http://gerrit.ovirt.org/23269
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I194ee092bffb7b88995b0312172a5a7b88a3033d
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
