Yaniv Dary has uploaded a new change for review. Change subject: reports: moved to using only ce edition dashboards in webadmin ......................................................................
reports: moved to using only ce edition dashboards in webadmin Change-Id: I0c62986ace8f7b04a038d4b0c461580639335bed Bug-Url: https://bugzilla.redhat.com/1096841 Signed-off-by: Yaniv Dary <yd...@redhat.com> --- R packaging/conf/reports.xml M packaging/setup/ovirt_engine_setup/reportsconstants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py 3 files changed, 4 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/44/27644/1 diff --git a/packaging/conf/reports.xml.in b/packaging/conf/reports.xml similarity index 98% rename from packaging/conf/reports.xml.in rename to packaging/conf/reports.xml index 66bad1f..83ca635 100644 --- a/packaging/conf/reports.xml.in +++ b/packaging/conf/reports.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <reports> - <dashboard is_ce="@JASPER_IS_CE@"> - <resource type="System">/reports_resources/webadmin_dashboards/@JASPER_NAME@/system_dashboard</resource> - <resource type="DataCenter">/reports_resources/webadmin_dashboards/@JASPER_NAME@/datacenter_dashboard</resource> - <resource type="Cluster">/reports_resources/webadmin_dashboards/@JASPER_NAME@/cluster_dashboard</resource> + <dashboard is_ce="true"> + <resource type="System">/reports_resources/webadmin_dashboards/ce/system_dashboard</resource> + <resource type="DataCenter">/reports_resources/webadmin_dashboards/ce/datacenter_dashboard</resource> + <resource type="Cluster">/reports_resources/webadmin_dashboards/ce/cluster_dashboard</resource> </dashboard> <resource type="DataCenter"> <category name="Executive"> diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py b/packaging/setup/ovirt_engine_setup/reportsconstants.py index 097890b..6a476ad 100644 --- a/packaging/setup/ovirt_engine_setup/reportsconstants.py +++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py @@ -123,11 +123,6 @@ PKG_DATA_DIR, 'ovirt-reports', ) - OVIRT_ENGINE_REPORTS_UI = os.path.join( - PKG_DATA_DIR, - 'conf', - 'reports.xml.in', - ) JASPER_BUILDOMATIC_CONFIG_TEMPALTE = os.path.join( PKG_DATA_DIR, 'conf', 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 59d44c2..fdb50c5 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 @@ -45,7 +45,6 @@ condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE], after=( osetupcons.Stages.DB_CONNECTION_AVAILABLE, - oreportscons.Stages.JASPER_NAME_SET, ), ) def misc(self): @@ -55,30 +54,6 @@ ].addFiles( group='ovirt_reports_files', fileList=uninstall_files, - ) - - self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( - filetransaction.FileTransaction( - name=os.path.join( - osetupcons.FileLocations.OVIRT_ENGINE_LOCALSTATEDIR, - 'reports.xml', - ), - content=outil.processTemplate( - template=( - oreportscons.FileLocations. - OVIRT_ENGINE_REPORTS_UI - ), - subst={ - '@JASPER_IS_CE@': 'true' if self.environment[ - oreportscons.JasperEnv.JASPER_NAME - ] == 'ce' else 'false', - '@JASPER_NAME@': self.environment[ - oreportscons.JasperEnv.JASPER_NAME - ], - }, - ), - modifiedList=uninstall_files, - ) ) self.environment[osetupcons.DBEnv.STATEMENT].updateVdcOptions( -- To view, visit http://gerrit.ovirt.org/27644 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c62986ace8f7b04a038d4b0c461580639335bed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <yd...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
