Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: setup: don't rely on priority
......................................................................
packaging: setup: don't rely on priority
Don't rely on priority for disabling plugins.
Change-Id: I85c0b6f826745b7619517f3cf06a5704b61584e5
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/engine/constants.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
7 files changed, 19 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/29197/1
diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py
b/packaging/setup/ovirt_engine_setup/engine/constants.py
index 0e9a35e..41e9f43 100644
--- a/packaging/setup/ovirt_engine_setup/engine/constants.py
+++ b/packaging/setup/ovirt_engine_setup/engine/constants.py
@@ -312,8 +312,15 @@
MEMORY_CHECK = 'osetup.memory.check'
+ CA_ALLOWED = 'osetup.engine.pki.ca.allow'
CA_AVAILABLE = 'osetup.pki.ca.available'
+ POSTGRES_PROVISIONING_ALLOWED = 'osetup.engine.provisioning.pgsql.allow'
+ NFS_CONFIG_ALLOWED = 'osetup.engine.system.nfs.allow'
+ APPMODE_ALLOWED = 'osetup.engine.config.appmode.allow'
+ KDUMP_ALLOW = 'osetup.engine.kdump.allow'
+ CONNECTION_ALLOW = 'osetup.engine.db.connection.allow'
+
@util.export
@util.codegen
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 04adc9e..f4883f8 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
@@ -67,7 +67,7 @@
condition=lambda self: self.environment[
oenginecons.EngineDBEnv.NEW_DATABASE
],
- priority=plugin.Stages.PRIORITY_HIGH,
+ name=oenginecons.Stages.APPMODE_ALLOWED,
)
def _customization_enable(self):
self._enabled = self.environment[oenginecons.CoreEnv.ENABLE]
@@ -79,6 +79,7 @@
),
after=(
oengcommcons.Stages.DIALOG_TITLES_S_ENGINE,
+ oenginecons.Stages.APPMODE_ALLOWED,
),
condition=lambda self: (
self._enabled and
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
index 0618a38..297d65c 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py
@@ -88,6 +88,7 @@
after=(
oengcommcons.Stages.DIALOG_TITLES_S_DATABASE,
),
+ name=oenginecons.Stages.CONNECTION_ALLOW,
)
def _customization_enable(self):
if not self.environment[oenginecons.CoreEnv.ENABLE]:
@@ -101,6 +102,7 @@
),
after=(
oengcommcons.Stages.DIALOG_TITLES_S_DATABASE,
+ oenginecons.Stages.CONNECTION_ALLOW,
),
condition=lambda self: self._enabled,
)
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 f71c48d..0474f51 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
@@ -70,7 +70,7 @@
oengcommcons.Stages.DB_CONNECTION_STATUS,
osetupcons.Stages.DIALOG_TITLES_S_SYSTEM,
),
- priority=plugin.Stages.PRIORITY_HIGH
+ name=oenginecons.Stages.KDUMP_ALLOW,
)
def _customization_disable(self):
if not self.environment[oenginecons.CoreEnv.ENABLE]:
@@ -90,6 +90,7 @@
after=(
oengcommcons.Stages.DB_CONNECTION_STATUS,
osetupcons.Stages.DIALOG_TITLES_S_SYSTEM,
+ oenginecons.Stages.KDUMP_ALLOW,
),
)
def _customization_firewall(self):
diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
index 44cb813..cddf94f 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py
@@ -123,7 +123,7 @@
osetupcons.Stages.CONFIG_PROTOCOLS_CUSTOMIZATION,
oengcommcons.Stages.DIALOG_TITLES_S_PKI,
),
- priority=plugin.Stages.PRIORITY_HIGH
+ name=oenginecons.Stages.CA_ALLOWED,
)
def _customization_enable(self):
if not self.environment[oenginecons.CoreEnv.ENABLE]:
@@ -137,6 +137,7 @@
after=(
osetupcons.Stages.CONFIG_PROTOCOLS_CUSTOMIZATION,
oengcommcons.Stages.DIALOG_TITLES_S_PKI,
+ oenginecons.Stages.CA_ALLOWED
),
condition=lambda self: self._enabled,
)
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
index 274ccc0..9a1af0a 100644
---
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
+++
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py
@@ -89,7 +89,7 @@
condition=lambda self: not self.environment[
oenginecons.CoreEnv.ENABLE
],
- priority=plugin.Stages.PRIORITY_HIGH
+ name=oenginecons.Stages.POSTGRES_PROVISIONING_ALLOWED,
)
def _customization_enable(self):
self._enabled = False
@@ -101,7 +101,7 @@
oengcommcons.Stages.DB_CONNECTION_CUSTOMIZATION,
),
after=(
- oengcommcons.Stages.DIALOG_TITLES_S_DATABASE,
+ oenginecons.Stages.POSTGRES_PROVISIONING_ALLOWED,
),
condition=lambda self: self._enabled,
)
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
index 546d36f..fe2d6f4 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
@@ -136,6 +136,7 @@
osetupcons.Stages.CONFIG_APPLICATION_MODE_AVAILABLE,
osetupcons.Stages.DIALOG_TITLES_S_SYSTEM,
),
+ name=oenginecons.Stages.NFS_CONFIG_ALLOWED
priority=plugin.Stages.PRIORITY_HIGH,
)
def _customization_enable(self):
@@ -151,6 +152,7 @@
after=(
osetupcons.Stages.CONFIG_APPLICATION_MODE_AVAILABLE,
osetupcons.Stages.DIALOG_TITLES_S_SYSTEM,
+ oenginecons.Stages.NFS_CONFIG_ALLOWED,
),
condition=lambda self: self._enabled,
)
--
To view, visit http://gerrit.ovirt.org/29197
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85c0b6f826745b7619517f3cf06a5704b61584e5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
