Yedidyah Bar David has uploaded a new change for review. Change subject: packacing: setup: move engine connection to common ......................................................................
packacing: setup: move engine connection to common Move the code connecting to the engine db from setup to common. Without this, engine-cleanup on a separate dwh machine fails. Change-Id: I378b64b28dac5d4b9f4f76895c6bb6b5972e5f8f Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py 2 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/45/39545/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py index 7e3ce3c..eb2f011 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py @@ -168,5 +168,30 @@ else: raise RuntimeError(msg) + @plugin.event( + stage=plugin.Stages.STAGE_MISC, + name=odwhcons.Stages.ENGINE_DB_CONNECTION_AVAILABLE, + condition=lambda self: ( + self.environment[odwhcons.CoreEnv.ENABLE] and + # If engine is enabled, STATEMENT and CONNECTION are set there + not self.environment[odwhcons.EngineCoreEnv.ENABLE] + ), + after=( + odwhcons.Stages.DB_SCHEMA, + oengcommcons.Stages.DB_CONNECTION_AVAILABLE, + ), + ) + def _engine_connection(self): + self.environment[ + odwhcons.EngineDBEnv.STATEMENT + ] = database.Statement( + environment=self.environment, + dbenvkeys=odwhcons.Const.ENGINE_DB_ENV_KEYS, + ) + # must be here as we do not have database at validation + self.environment[ + odwhcons.EngineDBEnv.CONNECTION + ] = self.environment[odwhcons.EngineDBEnv.STATEMENT].connect() + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py index 4eca7ee..3b949b2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py @@ -119,30 +119,5 @@ ), ) - @plugin.event( - stage=plugin.Stages.STAGE_MISC, - name=odwhcons.Stages.ENGINE_DB_CONNECTION_AVAILABLE, - condition=lambda self: ( - self.environment[odwhcons.CoreEnv.ENABLE] and - # If engine is enabled, STATEMENT and CONNECTION are set there - not self.environment[odwhcons.EngineCoreEnv.ENABLE] - ), - after=( - odwhcons.Stages.DB_SCHEMA, - oengcommcons.Stages.DB_CONNECTION_AVAILABLE, - ), - ) - def _engine_connection(self): - self.environment[ - odwhcons.EngineDBEnv.STATEMENT - ] = database.Statement( - environment=self.environment, - dbenvkeys=odwhcons.Const.ENGINE_DB_ENV_KEYS, - ) - # must be here as we do not have database at validation - self.environment[ - odwhcons.EngineDBEnv.CONNECTION - ] = self.environment[odwhcons.EngineDBEnv.STATEMENT].connect() - # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.ovirt.org/39545 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I378b64b28dac5d4b9f4f76895c6bb6b5972e5f8f 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
