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. Change-Id: I430eee10a06fabeab24c9f4f240373a7b830878a Bug-Url: https://bugzilla.redhat.com/1026089 Signed-off-by: Alex Lourie <alou...@redhat.com> --- M packaging/ovirt-engine-reports-setup.py 1 file changed, 13 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/45/21145/1 diff --git a/packaging/ovirt-engine-reports-setup.py b/packaging/ovirt-engine-reports-setup.py index cb525e6..5db5a74 100755 --- a/packaging/ovirt-engine-reports-setup.py +++ b/packaging/ovirt-engine-reports-setup.py @@ -284,28 +284,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()) + 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') + + if db_dict is None: + raise RuntimeError( + 'Engine and/or DWH were not setup on this machine. ' + 'Please execute: \"engine-setup\" and \"ovirt-engine-dwh-setup\" ' + 'before setting up the reports.' + ) return db_dict -- To view, visit http://gerrit.ovirt.org/21145 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I430eee10a06fabeab24c9f4f240373a7b830878a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alex Lourie <alou...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
