Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: remove upgrade action ......................................................................
packaging: setup: remove upgrade action we do not need it any more Change-Id: If73a2eba4478b54195fb712fb0169e5724e8b388 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-common/base/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py 5 files changed, 13 insertions(+), 54 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/23158/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 0aef077..1a15643 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -609,7 +609,6 @@ ACTION_SETUP = 'setup' ACTION_REMOVE = 'cleanup' - ACTION_UPGRADE = 'upgrade' ACTION_RENAME = 'rename' FIREWALL_MANAGER_HUMAN = 'skip' FIREWALL_MANAGER_IPTABLES = 'iptables' 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 818a7e7..2b3bcd3 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/db/connection.py @@ -102,16 +102,13 @@ @plugin.event( stage=plugin.Stages.STAGE_SETUP, name=osetupcons.Stages.DB_CONNECTION_SETUP, - condition=lambda self: self.environment[ - osetupcons.CoreEnv.ACTION - ] != osetupcons.Const.ACTION_SETUP, ) 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: + if config.get('ENGINE_DB_PASSWORD'): try: dbenv = {} for e, k in ( diff --git a/packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py index 2df993f..c0630a7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py @@ -19,7 +19,6 @@ """Misc plugin.""" -import os import gettext _ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') @@ -57,19 +56,11 @@ @plugin.event( stage=plugin.Stages.STAGE_INIT, - priority=plugin.Stages.PRIORITY_LOW ) def _init(self): - if os.path.exists( - osetupcons.FileLocations.OVIRT_SETUP_POST_INSTALL_CONFIG - ): - self.environment[ - osetupcons.CoreEnv.ACTION - ] = osetupcons.Const.ACTION_UPGRADE - else: - self.environment[ - osetupcons.CoreEnv.ACTION - ] = osetupcons.Const.ACTION_SETUP + self.environment[ + osetupcons.CoreEnv.ACTION + ] = osetupcons.Const.ACTION_SETUP # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py index 0a1de1b..0897f17 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py @@ -300,29 +300,14 @@ ) @plugin.event( - stage=plugin.Stages.STAGE_SETUP, - after=( - osetupcons.Stages.DB_CONNECTION_SETUP, - ), - ) - def _setup(self): - self._enabled = ( - self.environment[ - osetupcons.CoreEnv.ACTION - ] == osetupcons.Const.ACTION_UPGRADE and - not self.environment[ - osetupcons.DBEnv.NEW_DATABASE - ] - ) - - @plugin.event( stage=plugin.Stages.STAGE_VALIDATION, - condition=lambda self: self._enabled, priority=plugin.Stages.PRIORITY_HIGH, ) def _validateEnv(self): self._enabled = ( - self._enabled and + not self.environment[ + osetupcons.DBEnv.NEW_DATABASE + ] and self.environment[ osetupcons.AsyncTasksEnv.CLEAR_TASKS ] diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py index cf1e35e..ded9e03 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py @@ -89,7 +89,6 @@ def __init__(self, context): super(Plugin, self).__init__(context=context) - self._enabled = True @plugin.event( stage=plugin.Stages.STAGE_INIT, @@ -101,29 +100,15 @@ ) @plugin.event( - stage=plugin.Stages.STAGE_SETUP, - after=( - osetupcons.Stages.DB_CONNECTION_SETUP, - ), - ) - def _setup(self): - self._enabled = ( - self.environment[ - osetupcons.CoreEnv.ACTION - ] == osetupcons.Const.ACTION_UPGRADE and - not self.environment[ - osetupcons.DBEnv.NEW_DATABASE - ] - ) - - @plugin.event( stage=plugin.Stages.STAGE_VALIDATION, priority=plugin.Stages.PRIORITY_LOW, after=( osetupcons.Stages.DB_CONNECTION_CUSTOMIZATION, osetupcons.Stages.DB_CREDENTIALS_AVAILABLE_EARLY, ), - condition=lambda self: self._enabled, + condition=lambda self: not self.environment[ + osetupcons.DBEnv.NEW_DATABASE + ], ) def _validation(self): self.logger.info( @@ -167,7 +152,9 @@ @plugin.event( stage=plugin.Stages.STAGE_EARLY_MISC, - condition=lambda self: self._enabled, + condition=lambda self: self.environment[ + osetupcons.DBEnv.FIX_DB_VIOLATIONS + ], ) def _misc(self): self.logger.info( -- To view, visit http://gerrit.ovirt.org/23158 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If73a2eba4478b54195fb712fb0169e5724e8b388 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
