Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: re-enable app mode selection ......................................................................
packaging: setup: re-enable app mode selection re-enable app mode selection, disabled by mistake in http://gerrit.ovirt.org/28413 Change-Id: I217c9d61a012863beb6f5c4617b4fc5904cbe1fb Signed-off-by: Sandro Bonazzola <[email protected]> --- M .gitignore M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py 2 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/29119/1 diff --git a/.gitignore b/.gitignore index 9dea990..6c9bd1b 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ packaging/setup/ovirt_engine_setup/config.py packaging/setup/ovirt_engine_setup/engine/config.py packaging/setup/ovirt_engine_setup/engine_common/config.py +packaging/setup/ovirt_engine_setup/websocket_proxy/config.py packaging/sys-etc/logrotate.d/ovirt-engine packaging/sys-etc/logrotate.d/ovirt-engine-notifier packaging/sys-etc/logrotate.d/ovirt-engine-setup diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py index 60192ba..37880f3 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2014 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -59,6 +59,7 @@ stage=plugin.Stages.STAGE_CUSTOMIZATION, before=( oenginecons.Stages.DIALOG_TITLES_E_ENGINE, + osetupcons.Stages.CONFIG_APPLICATION_MODE_AVAILABLE, ), after=( oenginecons.Stages.DIALOG_TITLES_S_ENGINE, @@ -66,12 +67,10 @@ condition=lambda self: self.environment[ oenginecons.EngineDBEnv.NEW_DATABASE ], - name=osetupcons.Stages.CONFIG_APPLICATION_MODE_AVAILABLE, priority=plugin.Stages.PRIORITY_HIGH, ) def _customization_enable(self): - if not self.environment[oenginecons.CoreEnv.ENABLE]: - self._enabled = False + self._enabled = self.environment[oenginecons.CoreEnv.ENABLE] @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, @@ -88,7 +87,6 @@ name=osetupcons.Stages.CONFIG_APPLICATION_MODE_AVAILABLE, ) def _customization(self): - if self.environment[ osetupcons.ConfigEnv.APPLICATION_MODE ] is None: -- To view, visit http://gerrit.ovirt.org/29119 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I217c9d61a012863beb6f5c4617b4fc5904cbe1fb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
