Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: engine-setup.conf path for developers ......................................................................
packaging: setup: engine-setup.conf path for developers ovirt-engine-setup.conf path was previously build from /etc causing a permission denied error when running in developer mode. Now ovirt-engine-setup.conf path is gereated by Makefile including PREFIX. Change-Id: If638078fe073f0ded6601354fb7e4c2d0664d40d Signed-off-by: Sandro Bonazzola <[email protected]> --- M Makefile M packaging/setup/ovirt_engine_setup/config.py.in M packaging/setup/ovirt_engine_setup/constants.py 3 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/16182/1 diff --git a/Makefile b/Makefile index c23ed77..6347885 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,7 @@ sed \ -e "s|@ENGINE_DEFAULTS@|$(DATA_DIR)/conf/engine.conf.defaults|g" \ -e "s|@ENGINE_VARS@|$(PKG_SYSCONF_DIR)/engine.conf|g" \ + -e "s|@ENGINE_SETUP_VARS@|$(SYSCONF_DIR)/ovirt-engine-setup.conf|g" \ -e "s|@ENGINE_NOTIFIER_DEFAULTS@|$(DATA_DIR)/conf/notifier.conf.defaults|g" \ -e "s|@ENGINE_NOTIFIER_VARS@|$(PKG_SYSCONF_DIR)/notifier/notifier.conf|g" \ -e "s|@ENGINE_WSPROXY_DEFAULT_FILE@|$(DATA_DIR)/conf/ovirt-websocket-proxy.conf.defaults|g" \ diff --git a/packaging/setup/ovirt_engine_setup/config.py.in b/packaging/setup/ovirt_engine_setup/config.py.in index 177e9b3..33b6533 100644 --- a/packaging/setup/ovirt_engine_setup/config.py.in +++ b/packaging/setup/ovirt_engine_setup/config.py.in @@ -20,6 +20,7 @@ ENGINE_SYSCONFDIR = '@ENGINE_ETC@' +ENGINE_SETUP_CONFIG = '@ENGINE_SETUP_VARS@' ENGINE_SERVICE_CONFIG = '@ENGINE_VARS@' ENGINE_NOTIFIER_SERVICE_CONFIG = '@ENGINE_NOTIFIER_VARS@' ENGINE_PKIDIR = '@ENGINE_PKI@' diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index e4e0f29..69a3cdb 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -80,10 +80,7 @@ 'bin', ) - OVIRT_OVIRT_SETUP_CONFIG_FILE = os.path.join( - SYSCONFDIR, - 'ovirt-engine-setup.conf', - ) + OVIRT_OVIRT_SETUP_CONFIG_FILE = config.ENGINE_SETUP_CONFIG OVIRT_OVIRT_SETUP_LOG_PREFIX = 'ovirt-engine-setup' OVIRT_OVIRT_REMOVE_LOG_PREFIX = 'ovirt-engine-remove' -- To view, visit http://gerrit.ovirt.org/16182 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If638078fe073f0ded6601354fb7e4c2d0664d40d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
