Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: fix engine conf for reports access for devenv ......................................................................
packaging: setup: fix engine conf for reports access for devenv Write 10-setup-reports-access.conf relative to PREFIX and not hard coded to /etc. Change-Id: Ieb36563860828bd3d9309e7615380f43c588c674 Signed-off-by: Yedidyah Bar David <[email protected]> --- M Makefile M packaging/services/ovirt-engine-reportsd/config.py.in M packaging/setup/ovirt_engine_setup/reports/constants.py 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/73/35473/1 diff --git a/Makefile b/Makefile index 6b1e4ef..1e5bee3 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,8 @@ PYFLAKES=pyflakes PEP8=pep8 PREFIX=/usr/local +ENGINE_PREFIX=$(PREFIX) +ENGINE_VARS=$(PREFIX)/etc/$(ENGINE_NAME)/engine.conf LOCALSTATE_DIR=$(PREFIX)/var SYSCONF_DIR=$(PREFIX)/etc DATAROOT_DIR=$(PREFIX)/share @@ -83,6 +85,7 @@ sed \ -e "s|@SERVICE_DEFAULTS@|$(PKG_DATA_DIR)/services/ovirt-engine-reportsd/ovirt-engine-reportsd.conf|g" \ -e "s|@SERVICE_VARS@|$(PKG_SYSCONF_DIR)/ovirt-engine-reports.conf|g" \ + -e "s|@ENGINE_VARS@|$(ENGINE_VARS)|g" \ -e "s|@PKG_USER@|$(PKG_USER)|g" \ -e "s|@PKG_GROUP@|$(PKG_GROUP)|g" \ -e "s|@DATAROOT_DIR@|$(DATAROOT_DIR)|g" \ diff --git a/packaging/services/ovirt-engine-reportsd/config.py.in b/packaging/services/ovirt-engine-reportsd/config.py.in index 6bdba6d..6bfcfe6 100644 --- a/packaging/services/ovirt-engine-reportsd/config.py.in +++ b/packaging/services/ovirt-engine-reportsd/config.py.in @@ -15,6 +15,7 @@ DEV_PYTHON_DIR = '@DEV_PYTHON_DIR@' SERVICE_VARS = '@SERVICE_VARS@' +ENGINE_VARS = '@ENGINE_VARS@' import sys if DEV_PYTHON_DIR: diff --git a/packaging/setup/ovirt_engine_setup/reports/constants.py b/packaging/setup/ovirt_engine_setup/reports/constants.py index 683ede2..b660018 100644 --- a/packaging/setup/ovirt_engine_setup/reports/constants.py +++ b/packaging/setup/ovirt_engine_setup/reports/constants.py @@ -595,11 +595,8 @@ class EngineFileLocations(object): """Sync with ovirt-engine""" - OVIRT_ENGINE_SERVICE_CONFIGD = os.path.join( - FileLocations.SYSCONFDIR, - 'ovirt-engine', - 'engine.conf.d' - ) + ENGINE_VARS = config.ENGINE_VARS + OVIRT_ENGINE_SERVICE_CONFIGD = '%s.d' % config.ENGINE_VARS OVIRT_ENGINE_SERVICE_CONFIG_REPORTS = os.path.join( OVIRT_ENGINE_SERVICE_CONFIGD, '10-setup-reports-access.conf' -- To view, visit http://gerrit.ovirt.org/35473 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb36563860828bd3d9309e7615380f43c588c674 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
