Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: log setup events - add otopi upgrade ......................................................................
packaging: setup: log setup events - add otopi upgrade Log setup events for when otopi engine-setup-2 is used to upgrade from a previous engine-setup-2 and from a legacy engine-setup. Change-Id: I0805134c602f37a646065a8794feb3721587d601 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/core/misc.py 2 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/16245/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index dac14cf..7a2a98e 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -538,6 +538,8 @@ ACTION_SETUP = 'setup' ACTION_REMOVE = 'cleanup' + ACTION_UPGRADE_FROM_LEGACY = 'upgrade (from monolithic setup)' + ACTION_UPGRADE_FROM_OTOPI = 'upgrade (from otopi setup)' @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py index 29229af..52f8687 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/core/misc.py @@ -19,6 +19,7 @@ """Misc plugin.""" +import os import gettext _ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') @@ -49,9 +50,26 @@ otopicons.CoreEnv.LOG_FILE_NAME_PREFIX, osetupcons.FileLocations.OVIRT_OVIRT_SETUP_LOG_PREFIX ) - self.environment[ - osetupcons.CoreEnv.ACTION - ] = osetupcons.Const.ACTION_SETUP + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, + priority=plugin.Stages.PRIORITY_LOW + ) + def _init(self): + if self.environment[osetupcons.CoreEnv.UPGRADE_FROM_LEGACY]: + self.environment[ + osetupcons.CoreEnv.ACTION + ] = osetupcons.Const.ACTION_UPGRADE_FROM_LEGACY + elif os.path.exists( + osetupcons.FileLocations.OVIRT_SETUP_POST_INSTALL_CONFIG + ): + self.environment[ + osetupcons.CoreEnv.ACTION + ] = osetupcons.Const.ACTION_UPGRADE_FROM_OTOPI + else: + self.environment[ + osetupcons.CoreEnv.ACTION + ] = osetupcons.Const.ACTION_SETUP @plugin.event( stage=plugin.Stages.STAGE_CLOSEUP, -- To view, visit http://gerrit.ovirt.org/16245 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0805134c602f37a646065a8794feb3721587d601 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
