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. Fix https port. Change-Id: Ieb36563860828bd3d9309e7615380f43c588c674 Signed-off-by: Yedidyah Bar David <[email protected]> (cherry picked from commit b65b44e0ac7450d34bec81d6663581785649e59b) --- M Makefile M ovirt-engine-reports.spec.in M packaging/services/ovirt-engine-reportsd/config.py.in M packaging/setup/ovirt_engine_setup/reports/config.py.in M packaging/setup/ovirt_engine_setup/reports/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py 6 files changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/59/36459/1 diff --git a/Makefile b/Makefile index 6b1e4ef..6144c4d 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,11 @@ PYFLAKES=pyflakes PEP8=pep8 PREFIX=/usr/local +ENGINE_PREFIX=$(PREFIX) LOCALSTATE_DIR=$(PREFIX)/var SYSCONF_DIR=$(PREFIX)/etc +ENGINE_SYSCONF_DIR=$(ENGINE_PREFIX)/etc +ENGINE_VARS=$(ENGINE_SYSCONF_DIR)/$(ENGINE_NAME)/engine.conf DATAROOT_DIR=$(PREFIX)/share MAN_DIR=$(DATAROOT_DIR)/man DOC_DIR=$(DATAROOT_DIR)/doc @@ -83,6 +86,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/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in index 45cd6c6..9c8664a 100644 --- a/ovirt-engine-reports.spec.in +++ b/ovirt-engine-reports.spec.in @@ -59,6 +59,7 @@ OVIRT_REPORTS_NAME=%{reports_name} \\\ PREFIX=%{_prefix} \\\ SYSCONF_DIR=%{_sysconfdir} \\\ + ENGINE_SYSCONF_DIR=%{_sysconfdir} \\\ LOCALSTATE_DIR=%{_localstatedir} \\\ DATAROOT_DIR=%{_datadir} \\\ PYTHON=%{__python} \\\ 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/config.py.in b/packaging/setup/ovirt_engine_setup/reports/config.py.in index df47219..0952bd6 100644 --- a/packaging/setup/ovirt_engine_setup/reports/config.py.in +++ b/packaging/setup/ovirt_engine_setup/reports/config.py.in @@ -21,6 +21,7 @@ SERVICE_DEFAULTS = '@SERVICE_DEFAULTS@' SERVICE_VARS = '@SERVICE_VARS@' +ENGINE_VARS = '@ENGINE_VARS@' PKG_SYSCONF_DIR = '@PKG_SYSCONF_DIR@' PKG_PKI_DIR = '@PKG_PKI_DIR@' PKG_STATE_DIR = '@PKG_STATE_DIR@' diff --git a/packaging/setup/ovirt_engine_setup/reports/constants.py b/packaging/setup/ovirt_engine_setup/reports/constants.py index 30b4c46..4ed54c9 100644 --- a/packaging/setup/ovirt_engine_setup/reports/constants.py +++ b/packaging/setup/ovirt_engine_setup/reports/constants.py @@ -594,11 +594,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' diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py index 4d4fbc6..b748116 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/engine.py @@ -47,7 +47,7 @@ def _customization(self): reports_conf_content = ( 'ENGINE_REPORTS_BASE_URL=' - 'https://{fqdn}/ovirt-engine-reports\n' + 'https://{fqdn}:{port}/ovirt-engine-reports\n' 'ENGINE_REPORTS_DASHBOARD_URL=' '${{ENGINE_REPORTS_BASE_URL}}' '/flow.html?_flowId=viewReportFlow' @@ -62,6 +62,7 @@ 'ENGINE_REPORTS_READ_TIMEOUT=\n' ).format( fqdn=self.environment[osetupcons.ConfigEnv.FQDN], + port=self.environment[oreportscons.ConfigEnv.PUBLIC_HTTPS_PORT], ) if self.environment[oreportscons.EngineCoreEnv.ENABLE]: -- To view, visit http://gerrit.ovirt.org/36459 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb36563860828bd3d9309e7615380f43c588c674 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-engine-reports-3.5 Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
