Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: setup: process fw templates at validation
......................................................................
packaging: setup: process fw templates at validation
Change the event _process_templates of firewall_manager to be run
during validation instead of during customization. Generally
customization is intended for human interaction.
Change-Id: Ib4b1e89c4a263add052f3963929944554e865b71
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/all-in-one/firewall.py
M packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
M packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
M packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
4 files changed, 7 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/18660/1
diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/firewall.py
b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/firewall.py
index 0da386e..8f0672a 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/firewall.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/firewall.py
@@ -42,9 +42,6 @@
@plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
- before=(
- osetupcons.Stages.NET_FIREWALL_MANAGER_PROCESS_TEMPLATES,
- ),
after=(
osetupcons.Stages.NET_FIREWALL_MANAGER_AVAILABLE,
osetupcons.Stages.AIO_CONFIG_AVAILABLE,
diff --git a/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
b/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
index 80c9a68..79f4934 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
@@ -42,9 +42,6 @@
@plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
- before=(
- osetupcons.Stages.NET_FIREWALL_MANAGER_PROCESS_TEMPLATES,
- ),
after=(
osetupcons.Stages.NET_FIREWALL_MANAGER_AVAILABLE,
osetupcons.Stages.SYSTEM_NFS_CONFIG_AVAILABLE,
diff --git
a/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
b/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
index 904da87..086cb2c 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
@@ -175,15 +175,15 @@
)
@plugin.event(
- # must be at customization as otopi modules
- # need a chance to validate content
- stage=plugin.Stages.STAGE_CUSTOMIZATION,
+ stage=plugin.Stages.STAGE_VALIDATION,
name=osetupcons.Stages.NET_FIREWALL_MANAGER_PROCESS_TEMPLATES,
- priority=plugin.Stages.PRIORITY_LOW,
- after=(
- osetupcons.Stages.NET_FIREWALL_MANAGER_AVAILABLE,
- ),
# must be always enabled to create examples
+ # TODO: add:
+ # before=(
+ # otopicons.Stages.FIREWALLD_VALIDATION,
+ #),
+ # and remove:
+ priority=plugin.Stages.PRIORITY_HIGH,
)
def _process_templates(self):
for service in self.environment[osetupcons.NetEnv.FIREWALLD_SERVICES]:
diff --git a/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
b/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
index 1047d01..a24fb0b 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/system/nfs.py
@@ -137,9 +137,6 @@
@plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
- before=(
- osetupcons.Stages.NET_FIREWALL_MANAGER_PROCESS_TEMPLATES,
- ),
after=(
osetupcons.Stages.NET_FIREWALL_MANAGER_AVAILABLE,
osetupcons.Stages.SYSTEM_NFS_CONFIG_AVAILABLE,
--
To view, visit http://gerrit.ovirt.org/18660
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4b1e89c4a263add052f3963929944554e865b71
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
