Alex Lourie has uploaded a new change for review. Change subject: packaging: setup: update DB configuration reading ......................................................................
packaging: setup: update DB configuration reading This new implementation requires engine and dwh to be run and set up correctly before reports package can be setup. In case engine's or dwh settings are not found, the setup will exit with the corresponding message. Also it updates DB conf to be defined in a spec file. Change-Id: I430eee10a06fabeab24c9f4f240373a7b830878a Bug-Url: https://bugzilla.redhat.com/1026089 Signed-off-by: Alex Lourie <alou...@redhat.com> --- M Makefile A packaging/10-setup-database-reports.conf M packaging/ovirt-engine-reports-setup.py M packaging/ovirt-engine-reports.spec.in 4 files changed, 22 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/85/21185/1 diff --git a/Makefile b/Makefile index 6d98192..3515181 100644 --- a/Makefile +++ b/Makefile @@ -153,6 +153,7 @@ install_files: install -d $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d install -d $(DESTDIR)$(PKG_SYSCONF_DIR)/ovirt-engine-reports + install -d $(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_REPORTS_NAME)/engine-reports.conf.d install -d $(DESTDIR)$(BIN_DIR) install -d $(DESTDIR)$(SYSCONF_DIR)/httpd/conf.d install -d $(DESTDIR)$(DATA_DIR) @@ -160,6 +161,7 @@ install -d $(DESTDIR)$(DATA_DIR)/server-customizations cp -a reports/repository_files/* $(DESTDIR)$(DATA_DIR)/reports + install -p -m 660 packaging/10-setup-database-reports.conf $(DESTDIR)$(SYSCONF_DIR)/$(OVIRT_REPORTS_NAME)/engine-reports.conf.d install -p -m 644 packaging/50-ovirt-engine-reports.conf $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d install -p -m 644 packaging/z-ovirt-engine-reports-proxy.conf $(DESTDIR)$(SYSCONF_DIR)/httpd/conf.d install -p -m 755 packaging/ssl2jkstrust.py $(DESTDIR)$(DATA_DIR) diff --git a/packaging/10-setup-database-reports.conf b/packaging/10-setup-database-reports.conf new file mode 100644 index 0000000..1d88eca --- /dev/null +++ b/packaging/10-setup-database-reports.conf @@ -0,0 +1,3 @@ +REPORTS_DATABASE=ovirtenginereports +REPORTS_USER=engine_reports +REPORTS_PASSWORD= diff --git a/packaging/ovirt-engine-reports-setup.py b/packaging/ovirt-engine-reports-setup.py index 13f0e36..a02b742 100755 --- a/packaging/ovirt-engine-reports-setup.py +++ b/packaging/ovirt-engine-reports-setup.py @@ -336,28 +336,20 @@ } handler.close() dhandler.close() - else: - db_dict = { - 'dbname': JRS_DB_NAME, - 'host': utils.getDbHostName(), - 'port': utils.getDbPort(), - 'username': utils.getDbAdminUser(), - 'password': utils.getPassFromFile(utils.getDbAdminUser()), - 'engine_db': ENGINE_DB_DATABASE, - 'engine_user': utils.getDbAdminUser(), - 'engine_pass': utils.getPassFromFile(utils.getDbAdminUser()), - } - if os.path.exists(FILE_DATABASE_DWH_CONFIG): - dwhandler = utils.TextConfigFileHandler(FILE_DATABASE_DWH_CONFIG) - dwhandler.open() - db_dict['dwh_database'] = dwhandler.getParam('DWH_DATABASE') - db_dict['dwh_user'] = dwhandler.getParam('DWH_USER') - db_dict['dwh_pass'] = dwhandler.getParam('DWH_PASSWORD') else: - db_dict['dwh_database'] = 'ovirt_engine_history' - db_dict['dwh_user'] = utils.getDbAdminUser() - db_dict['dwh_pass'] = utils.getPassFromFile(utils.getDbAdminUser()) + raise RuntimeError( + 'Engine was not setup on this machine. ' + 'Please execute: \"engine-setup\" followed by ' + '\"ovirt-engine-dwh-setup\" ' + 'before setting up the reports.' + ) + + dwhandler = utils.TextConfigFileHandler(FILE_DATABASE_DWH_CONFIG) + dwhandler.open() + db_dict['dwh_database'] = dwhandler.getParam('DWH_DATABASE') + db_dict['dwh_user'] = dwhandler.getParam('DWH_USER') + db_dict['dwh_pass'] = dwhandler.getParam('DWH_PASSWORD') return db_dict diff --git a/packaging/ovirt-engine-reports.spec.in b/packaging/ovirt-engine-reports.spec.in index f615d95..456bfa2 100644 --- a/packaging/ovirt-engine-reports.spec.in +++ b/packaging/ovirt-engine-reports.spec.in @@ -5,6 +5,8 @@ %global reports_name ovirt-engine-reports %global reports_java %{_javadir}/%{reports_name} +%global engine_group ovirt +%global engine_user ovirt %global make_common_opts \\\ -j1 \\\ @@ -118,6 +120,9 @@ fi %files +%dir %attr(-, %{engine_user}, %{engine_group}) %{_sysconfdir}/%{reports_name}/engine-reports.conf.d +%config(noreplace) %{_sysconfdir}/%{reports_name}/engine-reports.conf.d/10-setup-database-reports.conf + %{_sysconfdir}/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf %{_sysconfdir}/ovirt-engine/ovirt-engine-reports %{_sysconfdir}/httpd/conf.d/z-ovirt-engine-reports-proxy.conf -- To view, visit http://gerrit.ovirt.org/21185 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I430eee10a06fabeab24c9f4f240373a7b830878a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-3.3.1 Gerrit-Owner: Alex Lourie <alou...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
