Yedidyah Bar David has posted comments on this change. Change subject: packaging: setup: allow reports on separate host ......................................................................
Patch Set 38: (7 comments) http://gerrit.ovirt.org/#/c/28479/38/Makefile File Makefile: Line 41: DOC_DIR=$(DATAROOT_DIR)/doc Line 42: PKG_DATA_DIR=$(DATAROOT_DIR)/ovirt-engine-reports Line 43: JAVA_DIR=$(DATAROOT_DIR)/java Line 44: SYS_JAVA_DIR=/usr/share/java Line 45: ENGINE_DATA_DIR=$(DATAROOT_DIR)/ovirt-engine > please change to ENGINE NAME parameter. Done Line 46: PKG_JAVA_DIR=$(JAVA_DIR)/ovirt-engine-reports Line 47: PKG_SYSCONF_DIR=$(SYSCONF_DIR)/ovirt-engine-reports Line 48: PKG_PKI_DIR=$(SYSCONF_DIR)/pki/$(ENGINE_NAME) Line 49: PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/ovirt-engine-reports http://gerrit.ovirt.org/#/c/28479/38/ovirt-engine-reports.spec.in File ovirt-engine-reports.spec.in: Line 29: %global engine_user ovirt Line 30: %global engine_gid 108 Line 31: %global engine_group ovirt Line 32: %global engine_uid 108 Line 33: %global engine_user ovirt > please remove duplicates Done Line 34: Line 35: # Macro to create a user: Line 36: # Line 37: # %1 user name http://gerrit.ovirt.org/#/c/28479/38/packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py File packaging/services/ovirt-engine-reportsd/ovirt-engine-reportsd.py: Line 1: #!/usr/bin/python > Please open bug on this to refactor the service code to one core. https://bugzilla.redhat.com/1116116 Line 2: Line 3: # Copyright 2014 Red Hat Line 4: # Line 5: # Licensed under the Apache License, Version 2.0 (the "License"); http://gerrit.ovirt.org/#/c/28479/38/packaging/setup/ovirt_engine_setup/reports/constants.py File packaging/setup/ovirt_engine_setup/reports/constants.py: Line 45: SERVICE_NAME = 'ovirt-engine-reportsd' Line 46: OVIRT_ENGINE_REPORTS_DB_BACKUP_PREFIX = 'reports' Line 47: OVIRT_ENGINE_REPORTS_PACKAGE_NAME = 'ovirt-engine-reports' Line 48: OVIRT_ENGINE_REPORTS_SETUP_PACKAGE_NAME = 'ovirt-engine-reports-setup' Line 49: PKI_REPORTS_JBOSS_CERT_NAME = 'reports' > sync with engine Done Line 50: PKI_REPORTS_APACHE_CERT_NAME = 'apache-reports' Line 51: Line 52: @classproperty Line 53: def REPORTS_DB_ENV_KEYS(self): http://gerrit.ovirt.org/#/c/28479/38/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py File packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py: Line 62 Line 63 Line 64 Line 65 Line 66 While looking at your comment below I briefly looked at this code and realized I do not understand what it does. Do we need to write this reports.xml in another place now, with our own service? Or does the service code read it from this location anyway? On another look I see that it was discussed in http://gerrit.ovirt.org/28243 , not sure what should be done. Also not sure how I did not fail on this during testing - perhaps the defaults are good enough or something like that. Perhaps just open a bug about this. Line 81: ), Line 82: ) Line 83: def _closeup(self): Line 84: # TODO add some condition to not do this if engine+reports are on Line 85: # same host > Please do this for the user and write to restart on remote. and this needs Done. update code is in misc so before restart anyway. Note that it used to be there (pointing to '/ovirt-engine-reports' with no host) until http://gerrit.ovirt.org/28243 and then removed. Line 86: self.dialog.note( Line 87: text=_( Line 88: 'To update the Reports link on the main web interface page, ' Line 89: 'please update the database and restart the engine service, ' http://gerrit.ovirt.org/#/c/28479/38/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py File packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py: Line 978: addition = libxml2.parseDoc( Line 979: ''' Line 980: <folder>%s</folder> Line 981: ''' % Line 982: self.environment[oreportscons.JasperEnv.THEME] > Please check this with latest pep8. should work. Done Line 983: ) Line 984: xml.xpath.xpathEval('/folder')[0].addChild( Line 985: addition.getRootElement() Line 986: ) -- To view, visit http://gerrit.ovirt.org/28479 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I426f040446e6288f481f9a256ddbfa35ce729e0b Gerrit-PatchSet: 38 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> Gerrit-Reviewer: Lev Veyde <[email protected]> Gerrit-Reviewer: Sandro Bonazzola <[email protected]> Gerrit-Reviewer: Shirly Radco <[email protected]> Gerrit-Reviewer: Simone Tiraboschi <[email protected]> Gerrit-Reviewer: Yaniv Dary <[email protected]> Gerrit-Reviewer: Yedidyah Bar David <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
