Yaniv Dary has uploaded a new change for review.

Change subject: reports: provide reports.xml to engine over http
......................................................................

reports: provide reports.xml to engine over http

this is to support reports integration to webadmin on separate
servers.

Change-Id: Ia0230c58de2edfb3896b7af2e71ad27d47ee2229
Bug-Url: https://bugzilla.redhat.com/1116851
Signed-off-by: Yaniv Dary <[email protected]>
---
M ovirt-engine-reports.spec.in
M 
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/57/29657/1

diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in
index 2e015ff..5c95c0b 100644
--- a/ovirt-engine-reports.spec.in
+++ b/ovirt-engine-reports.spec.in
@@ -205,7 +205,6 @@
 %endif
 if [ "$1" -eq 0 ]; then
        rm -rf /var/lib/ovirt-engine-reports/%{reports_name}.war
-       rm -f /var/lib/ovirt-engine/reports.xml
 fi
 
 %files
diff --git 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py
 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py
index 0e54be4..8c63e23 100644
--- 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py
+++ 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py
@@ -63,7 +63,10 @@
             self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
                 filetransaction.FileTransaction(
                     name=os.path.join(
-                        oreportscons.FileLocations.OVIRT_ENGINE_LOCALSTATEDIR,
+                        (
+                            oreportscons.FileLocations.
+                            OVIRT_ENGINE_REPORTS_JASPER_WAR
+                        ),
                         'reports.xml',
                     ),
                     content=content.read(),


-- 
To view, visit http://gerrit.ovirt.org/29657
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0230c58de2edfb3896b7af2e71ad27d47ee2229
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to