Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: read engine defaults when reading configuration ......................................................................
packaging: setup: read engine defaults when reading configuration Change-Id: I85d1481f48e082b26d767a9b3c7bd64b6c42018a Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/config.py.in M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-common/base/db/connection.py 3 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/22896/1 diff --git a/packaging/setup/ovirt_engine_setup/config.py.in b/packaging/setup/ovirt_engine_setup/config.py.in index 8fef77e..fb42899 100644 --- a/packaging/setup/ovirt_engine_setup/config.py.in +++ b/packaging/setup/ovirt_engine_setup/config.py.in @@ -22,6 +22,7 @@ ENGINE_SYSCONFDIR = '@ENGINE_ETC@' ENGINE_SETUP_CONFIG = '@ENGINE_SETUP_VARS@' ENGINE_SERVICE_CONFIG = '@ENGINE_VARS@' +ENGINE_SERVICE_CONFIG_DEFAULTS = '@ENGINE_DEFAULTS@' ENGINE_WEBSOCKET_PROXY_CONFIG = '@ENGINE_WSPROXY_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 a5c3296..2dd779b 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -75,6 +75,8 @@ OVIRT_ENGINE_TMPDIR = config.ENGINE_TMP OVIRT_ENGINE_LOGDIR = config.ENGINE_LOG OVIRT_ENGINE_SERVICE_CONFIG = config.ENGINE_SERVICE_CONFIG + OVIRT_ENGINE_SERVICE_CONFIG_DEFAULTS = \ + config.ENGINE_SERVICE_CONFIG_DEFAULTS OVIRT_ENGINE_WEBSOCKET_PROXY_CONFIG = config.ENGINE_WEBSOCKET_PROXY_CONFIG OVIRT_ENGINE_NOTIFIER_SERVICE_CONFIG = \ config.ENGINE_NOTIFIER_SERVICE_CONFIG diff --git a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py index b9cb5e6..1b2c02d 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py @@ -105,6 +105,7 @@ ) def _setup(self): config = configfile.ConfigFile([ + osetupcons.FileLocations.OVIRT_ENGINE_SERVICE_CONFIG_DEFAULTS, osetupcons.FileLocations.OVIRT_ENGINE_SERVICE_CONFIG ]) if config.get('ENGINE_DB_PASSWORD') is not None: -- To view, visit http://gerrit.ovirt.org/22896 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85d1481f48e082b26d767a9b3c7bd64b6c42018a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
