Martin Peřina has uploaded a new change for review. Change subject: packaging: Don't show fence_kdump listener in summary ......................................................................
packaging: Don't show fence_kdump listener in summary Don't show "Configuring fence_kdump listener" message in summary of engine-setup, because listener is part of ovirt-engine setup (cannot be enabled/disabled by user). Change-Id: Ib31f1ff25ef406ccdf40e7ddcb4047984fef3ebd Bug-Url: https://bugzilla.redhat.com/1114040 Signed-off-by: Martin Perina <[email protected]> --- M packaging/setup/ovirt_engine_setup/engine/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py 2 files changed, 3 insertions(+), 40 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/30142/1 diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py b/packaging/setup/ovirt_engine_setup/engine/constants.py index 2548a6d..7259314 100644 --- a/packaging/setup/ovirt_engine_setup/engine/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine/constants.py @@ -591,15 +591,6 @@ MAC_RANGE_POOL = 'OVESETUP_CONFIG/macRangePool' - @osetupattrs( - answerfile=True, - summary=True, - description=_('Configure fence_kdump listener'), - postinstallfile=True, - ) - def FENCE_KDUMP_LISTENER_CONFIG(self): - return 'OVESETUP_CONFIG/fenceKdumpListenerConfig' - @util.export @util.codegen diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py index 0474f51..c98f739 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py @@ -38,28 +38,7 @@ def __init__(self, context): super(Plugin, self).__init__(context=context) - self._needStart = False self._enabled = True - - @plugin.event( - stage=plugin.Stages.STAGE_INIT, - ) - def _init(self): - self.environment.setdefault( - oenginecons.ConfigEnv.FENCE_KDUMP_LISTENER_CONFIG, - True - ) - - @plugin.event( - stage=plugin.Stages.STAGE_LATE_SETUP, - condition=lambda self: not self.environment[ - osetupcons.CoreEnv.DEVELOPER_MODE - ], - ) - def _late_setup_service_state(self): - self._needStart = self.services.status( - name=oenginecons.Const.FENCE_KDUMP_LISTENER_SERVICE_NAME, - ) @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, @@ -75,15 +54,10 @@ def _customization_disable(self): if not self.environment[oenginecons.CoreEnv.ENABLE]: self._enabled = False - self.environment[ - oenginecons.ConfigEnv.FENCE_KDUMP_LISTENER_CONFIG - ] = False @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, - condition=lambda self: self.environment[ - oenginecons.ConfigEnv.FENCE_KDUMP_LISTENER_CONFIG - ], + condition=lambda self: self._enabled, before=( osetupcons.Stages.DIALOG_TITLES_E_SYSTEM, ), @@ -106,10 +80,8 @@ condition=lambda self: ( not self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE - ] and ( - self._needStart or - self._enabled - ) + ] and + self._enabled ), ) def _closeup(self): -- To view, visit http://gerrit.ovirt.org/30142 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib31f1ff25ef406ccdf40e7ddcb4047984fef3ebd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
