Hello Yedidyah Bar David,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/18764
to review the following change.
Change subject: packaging: setup: firewall-manager - check status
......................................................................
packaging: setup: firewall-manager - check status
During setup, ask only about firewall managers that are both enabled
and active.
Currently this means that if both firewalld and iptables are enabled,
but iptables is active and firewalld isn't, first we ask about firewalld,
and if users accepts, we do not even ask about iptables. With this
change, at this state, we only ask about iptables.
Change-Id: Ice741b9738c822d48ab3719dd34cbe989b359afe
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/18764/1
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..6d3f2dd 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/network/firewall_manager.py
@@ -137,9 +137,15 @@
def _customization(self):
if self.environment[osetupcons.ConfigEnv.FIREWALL_MANAGER] is None:
managers = []
- if self.environment[otopicons.NetEnv.FIREWALLD_AVAILABLE]:
+ if (
+ self.environment[otopicons.NetEnv.FIREWALLD_AVAILABLE] and
+ self.services.status('firewalld')
+ ):
managers.append('firewalld')
- if self.services.exists('iptables'):
+ if (
+ self.services.exists('iptables') and
+ self.services.status('iptables')
+ ):
managers.append('iptables')
for manager in managers:
--
To view, visit http://gerrit.ovirt.org/18764
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice741b9738c822d48ab3719dd34cbe989b359afe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
