Yaniv Dary has uploaded a new change for review. Change subject: packaging: remove 10-setup-database-reports.conf from package ......................................................................
packaging: remove 10-setup-database-reports.conf from package conf.d files should not be in packaging. marking these as %config is even worse and will not enable proper upgrade. rename to 10-setup-database.conf as already in reports folder. Change-Id: I82c64c34993661cd8225b72f63326251422fd20a Bug-Url: https://bugzilla.redhat.com/1043957 Signed-off-by: Yaniv Dary <[email protected]> --- M Makefile D packaging/10-setup-database-reports.conf M packaging/common_utils.py M packaging/ovirt-engine-reports-setup.py M packaging/ovirt-engine-reports.spec.in 5 files changed, 39 insertions(+), 52 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/27/22527/1 diff --git a/Makefile b/Makefile index 8a20d3d..e8b9708 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,6 @@ 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)/ovirt-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 deleted file mode 100644 index 1d88eca..0000000 --- a/packaging/10-setup-database-reports.conf +++ /dev/null @@ -1,3 +0,0 @@ -REPORTS_DATABASE=ovirtenginereports -REPORTS_USER=engine_reports -REPORTS_PASSWORD= diff --git a/packaging/common_utils.py b/packaging/common_utils.py index 657b1af..1d0aab6 100755 --- a/packaging/common_utils.py +++ b/packaging/common_utils.py @@ -38,7 +38,7 @@ FILE_PG_PASS="/etc/ovirt-engine/.pgpass" DIR_DATABASE_REPORTS_CONFIG = "/etc/ovirt-engine-reports/ovirt-engine-reports.conf.d/" -FILE_DATABASE_REPORTS_CONFIG = "10-setup-database-reports.conf" +FILE_DATABASE_REPORTS_CONFIG = "10-setup-database.conf" PGPASS_FILE_USER_LINE = "DB USER credentials" PGPASS_FILE_ADMIN_LINE = "DB ADMIN credentials" FILE_ENGINE_CONFIG_BIN="/usr/bin/engine-config" diff --git a/packaging/ovirt-engine-reports-setup.py b/packaging/ovirt-engine-reports-setup.py index 551ec41..df8d342 100755 --- a/packaging/ovirt-engine-reports-setup.py +++ b/packaging/ovirt-engine-reports-setup.py @@ -54,9 +54,9 @@ REPORTS_SERVER_DIR = "/usr/share/%s" % JRS_PACKAGE_NAME REPORTS_SERVER_BUILDOMATIC_DIR = "%s/buildomatic" % REPORTS_SERVER_DIR FILE_JASPER_DB_CONN = "%s/default_master.properties" % REPORTS_SERVER_BUILDOMATIC_DIR -FILE_DATABASE_CONFIG = "/etc/ovirt-engine/engine.conf.d/10-setup-database.conf" -FILE_DATABASE_DWH_CONFIG = "/etc/ovirt-engine-dwh/ovirt-engine-dwhd.conf.d/10-setup-database-dwh.conf" -FILE_DATABASE_REPORTS_CONFIG = "/etc/ovirt-engine-reports/ovirt-engine-reports.conf.d/10-setup-database-reports.conf" +FILE_DATABASE_ENGINE_CONFIG = "/etc/ovirt-engine/engine.conf.d/10-setup-database.conf" +FILE_DATABASE_DWH_CONFIG = "/etc/ovirt-engine-dwh/ovirt-engine-dwhd.conf.d/10-setup-database.conf" +FILE_DATABASE_REPORTS_CONFIG = "/etc/ovirt-engine-reports/ovirt-engine-reports.conf.d/10-setup-database.conf" FILE_ENGINE_CONF_DEFAULTS = "/usr/share/ovirt-engine/services/ovirt-engine/ovirt-engine.conf" FILE_ENGINE_CONF = "/etc/ovirt-engine/engine.conf" @@ -308,51 +308,38 @@ raise OSError("Cannot find password for db") def getDbDictFromOptions(): - if os.path.exists(FILE_DATABASE_CONFIG): - handler = utils.TextConfigFileHandler(FILE_DATABASE_CONFIG) - handler.open() - dhandler = handler - if os.path.exists(FILE_DATABASE_REPORTS_CONFIG): - dhandler = utils.TextConfigFileHandler(FILE_DATABASE_REPORTS_CONFIG) - dhandler.open() - db_dict = { - 'dbname': ( - dhandler.getParam('REPORTS_DATABASE') or - JRS_DB_NAME - ), - 'host': handler.getParam('ENGINE_DB_HOST').strip('"'), - 'port': handler.getParam('ENGINE_DB_PORT').strip('"'), - 'username': ( - dhandler.getParam('REPORTS_USER') or - REPORTS_DB_USER - ), - 'password': ( - dhandler.getParam('REPORTS_PASSWORD') or - utils.generatePassword() - ), - 'engine_db': ( - handler.getParam('ENGINE_DB_DATABASE').strip('"') or - ENGINE_DB_DATABASE - ), - 'engine_user': handler.getParam('ENGINE_DB_USER').strip('"'), - 'engine_pass': handler.getParam('ENGINE_DB_PASSWORD').strip('"'), - } - handler.close() - dhandler.close() + db_dict = { + 'dbname': JRS_DB_NAME, + 'host': utils.getDbHostName(), + 'port': utils.getDbPort(), + 'username': REPORTS_DB_USER, + 'password': utils.generatePassword(), + 'engine_db': ENGINE_DB_DATABASE, + } - else: - raise RuntimeError( - 'Engine was not setup on this machine. ' - 'Please execute: \"engine-setup\" followed by ' - '\"ovirt-engine-dwh-setup\" ' - 'before setting up the reports.' - ) + for file in (FILE_DATABASE_ENGINE_CONFIG, FILE_DATABASE_DWH_CONFIG, FILE_DATABASE_REPORTS_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 os.path.exists(file): + handler = utils.TextConfigFileHandler(file) + handler.open() + + for k, v in ( + ('dbname', 'REPORTS_DATABASE'), + ('host', 'ENGINE_DB_HOST'), + ('port', 'ENGINE_DB_PORT'), + ('username', 'REPORTS_USER'), + ('password', 'REPORTS_PASSWORD'), + ('engine_db', 'ENGINE_DB_DATABASE'), + ('engine_user', 'ENGINE_DB_USER'), + ('engine_pass', 'ENGINE_DB_PASSWORD'), + ('dwh_database', 'DWH_DATABASE'), + ('dwh_user', 'DWH_USER'), + ('dwh_pass', 'DWH_PASSWORD'), + ): + s = handler.getParam(v) + if s is not None: + db_dict[k] = s.strip('"') + handler.close() return db_dict @@ -934,6 +921,11 @@ print "Please install & configure oVirt engine by executing \"engine-setup\" prior to setting up the %s." % JRS_APP_NAME return 0 + if not os.path.exists(FILE_DATABASE_DWH_CONFIG): + logging.debug("ovirt-engine-dwh is not installed, cannot continue") + print "Please install & configure oVirt engine data warehouse by executing \"ovirt-engine-dwh-setup\" prior to setting up the %s." % JRS_APP_NAME + return 0 + # Check if ovirt-engine is up, if so prompt the user to stop it. if utils.stopEngine(options['STOP_ENGINE']): warUpdated = isWarUpdated() diff --git a/packaging/ovirt-engine-reports.spec.in b/packaging/ovirt-engine-reports.spec.in index dda26f1..3f3da44 100644 --- a/packaging/ovirt-engine-reports.spec.in +++ b/packaging/ovirt-engine-reports.spec.in @@ -121,7 +121,6 @@ %files %dir %attr(-, %{engine_user}, %{engine_group}) %{_sysconfdir}/%{reports_name}/ovirt-engine-reports.conf.d -%config(noreplace) %{_sysconfdir}/%{reports_name}/ovirt-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 -- To view, visit http://gerrit.ovirt.org/22527 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82c64c34993661cd8225b72f63326251422fd20a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
