Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: use also ENGINE_VARS ......................................................................
packaging: use also ENGINE_VARS Change-Id: I396bb0ea28d505bf5c522c20eb3328ead62cd79b Signed-off-by: Yedidyah Bar David <[email protected]> --- M Makefile M packaging/services/ovirt-engine-dwhd/config.py.in M packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py 4 files changed, 4 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/69/28169/1 diff --git a/Makefile b/Makefile index cccd91c..578d0fb 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ -e "s|@PKG_JAVA_LIB@|$(PKG_JAVA_LIB)|g" \ -e "s|@DEV_PYTHON_DIR@|$(DEV_PYTHON_DIR)|g" \ -e "s|@DWH_VARS@|$(PKG_SYSCONF_DIR)/ovirt-engine-dwhd.conf|g" \ + -e "s|@ENGINE_VARS@|$(SYSCONF_DIR)/ovirt-engine/engine.conf|g" \ -e "s|@DWH_DEFAULTS@|$(PKG_DATA_DIR)/services/ovirt-engine-dwhd/ovirt-engine-dwhd.conf|g" \ -e "s|@RPM_VERSION@|$(RPM_VERSION)|g" \ -e "s|@RPM_RELEASE@|$(RPM_RELEASE)|g" \ diff --git a/packaging/services/ovirt-engine-dwhd/config.py.in b/packaging/services/ovirt-engine-dwhd/config.py.in index 8aeb6e7..c4961a4 100644 --- a/packaging/services/ovirt-engine-dwhd/config.py.in +++ b/packaging/services/ovirt-engine-dwhd/config.py.in @@ -16,6 +16,7 @@ PKG_SYSCONF_DIR = '@PKG_SYSCONF_DIR@' DEV_PYTHON_DIR = '@DEV_PYTHON_DIR@' DWH_VARS = '@DWH_VARS@' +ENGINE_VARS = '@ENGINE_VARS@' import sys diff --git a/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py b/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py index 1e0f5bb..1e610f0 100755 --- a/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py +++ b/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py @@ -127,6 +127,7 @@ ( self._defaults, config.DWH_VARS, + config.ENGINE_VARS, ), ) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py index 706f145..4812361 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py @@ -116,19 +116,7 @@ mode=0o600, owner=self.environment[osetupcons.SystemEnv.USER_ENGINE], enforcePermissions=True, - content='%s%s' % ( - self._getDBConfig( - prefix='ENGINE', - host=self.environment[osetupcons.DBEnv.HOST], - port=self.environment[osetupcons.DBEnv.PORT], - user=self.environment[osetupcons.DBEnv.USER], - password=self.environment[osetupcons.DBEnv.PASSWORD], - database=self.environment[osetupcons.DBEnv.DATABASE], - secured=self.environment[osetupcons.DBEnv.SECURED], - hostValidation=self.environment[ - osetupcons.DBEnv.SECURED_HOST_VALIDATION - ], - ), + content='%s' % ( self._getDBConfig( prefix='DWH', host=self.environment[odwhcons.DBEnv.HOST], -- To view, visit http://gerrit.ovirt.org/28169 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I396bb0ea28d505bf5c522c20eb3328ead62cd79b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
