Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: all-in-one: Add titles ......................................................................
packaging: setup: all-in-one: Add titles Add titles for the allinone plugin. Also make storage run after core, where we ask the user if we enable this plugin. Change-Id: I70dd4bfa18d7c34ca9ed1293c0c6c921e0bebec8 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/all-in-one/core.py M packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py M packaging/setup/plugins/ovirt-engine-setup/all-in-one/storage.py M packaging/setup/plugins/ovirt-engine-setup/dialog/titles.py 5 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/18424/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index a5fe44b..2fdfa46 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -533,6 +533,7 @@ CONFIG_ISO_DOMAIN_AVAILABLE = 'osetup.config.iso_domain.available' APACHE_RESTART = 'osetup.apache.core.restart' + DIALOG_TITLES_S_ALLINONE = 'osetup.dialog.titles.allinone.start' DIALOG_TITLES_S_APACHE = 'osetup.dialog.titles.apache.start' DIALOG_TITLES_S_DATABASE = 'osetup.dialog.titles.database.start' DIALOG_TITLES_S_ENGINE = 'osetup.dialog.titles.engine.start' @@ -541,6 +542,7 @@ DIALOG_TITLES_S_PACKAGES = 'osetup.dialog.titles.packaging.start' DIALOG_TITLES_S_PKI = 'osetup.dialog.titles.pki.start' DIALOG_TITLES_S_SYSTEM = 'osetup.dialog.titles.system.start' + DIALOG_TITLES_E_ALLINONE = 'osetup.dialog.titles.allinone.end' DIALOG_TITLES_E_APACHE = 'osetup.dialog.titles.apache.end' DIALOG_TITLES_E_DATABASE = 'osetup.dialog.titles.database.end' DIALOG_TITLES_E_ENGINE = 'osetup.dialog.titles.engine.end' diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/core.py b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/core.py index 2f2225a..c527cbe 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/core.py +++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/core.py @@ -71,7 +71,10 @@ condition=lambda self: self._enabled, name=osetupcons.Stages.AIO_CONFIG_AVAILABLE, before=( - osetupcons.Stages.DIALOG_TITLES_S_NETWORK, + osetupcons.Stages.DIALOG_TITLES_E_ALLINONE, + ), + after=( + osetupcons.Stages.DIALOG_TITLES_S_ALLINONE, ), ) def _constomization(self): diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py index cdd16ab..361403f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py +++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py @@ -69,6 +69,9 @@ self._enabled and self.environment[osetupcons.AIOEnv.CONFIGURE] ), + before=( + osetupcons.Stages.DIALOG_TITLES_E_ALLINONE, + ), after=( osetupcons.Stages.AIO_CONFIG_AVAILABLE, ), diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/storage.py b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/storage.py index 6f18424..6fee16a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/storage.py +++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/storage.py @@ -76,7 +76,13 @@ condition=lambda self: self.environment[ osetupcons.AIOEnv.CONFIGURE ], - name=osetupcons.Stages.AIO_CONFIG_STORAGE + name=osetupcons.Stages.AIO_CONFIG_STORAGE, + before=( + osetupcons.Stages.DIALOG_TITLES_E_ALLINONE, + ), + after=( + osetupcons.Stages.AIO_CONFIG_AVAILABLE, + ), ) def _customization(self): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/dialog/titles.py b/packaging/setup/plugins/ovirt-engine-setup/dialog/titles.py index fe0e546..8172c18 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/dialog/titles.py +++ b/packaging/setup/plugins/ovirt-engine-setup/dialog/titles.py @@ -48,6 +48,28 @@ @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, + name=osetupcons.Stages.DIALOG_TITLES_S_ALLINONE, + condition=lambda self: self.environment[ + osetupcons.AIOEnv.ENABLE + ], + ) + def _title_s_allinone(self): + self._title( + text=_('ALL IN ONE CONFIGURATION'), + ) + + @plugin.event( + stage=plugin.Stages.STAGE_CUSTOMIZATION, + name=osetupcons.Stages.DIALOG_TITLES_E_ALLINONE, + after=( + osetupcons.Stages.DIALOG_TITLES_S_ALLINONE, + ), + ) + def _title_e_allinone(self): + pass + + @plugin.event( + stage=plugin.Stages.STAGE_CUSTOMIZATION, name=osetupcons.Stages.DIALOG_TITLES_S_PACKAGES, condition=lambda self: self._distribution in ( 'redhat', 'fedora', 'centos', -- To view, visit http://gerrit.ovirt.org/18424 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70dd4bfa18d7c34ca9ed1293c0c6c921e0bebec8 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
