Sandro Bonazzola has uploaded a new change for review.

Change subject: packaging: setup: avoid iptables override on AIO
......................................................................

packaging: setup: avoid iptables override on AIO

When adding the host within AIO plugin, avoid to try
to override iptables config. Overriding iptables
could conflict with firewalld configuration of the host
and is already done by the installer.

Change-Id: Iceeff7953520edd293fa9f4965608354599669f7
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M packaging/fedora/setup/plugins/all_in_one_100.py
M packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/16323/1

diff --git a/packaging/fedora/setup/plugins/all_in_one_100.py 
b/packaging/fedora/setup/plugins/all_in_one_100.py
index 3a39cd3..5642d04 100644
--- a/packaging/fedora/setup/plugins/all_in_one_100.py
+++ b/packaging/fedora/setup/plugins/all_in_one_100.py
@@ -292,6 +292,7 @@
         controller.CONF["API_OBJECT"].hosts.add(params.Host(name=LOCAL_HOST,
                                                                
address=controller.CONF["HOST_FQDN"],
                                                                
reboot_after_installation=False,
+                                                               
override_iptables=False,
                                                                
cluster=controller.CONF["API_OBJECT"].clusters.get(LOCAL_CLUSTER),
                                                                
root_password=controller.CONF["SUPERUSER_PASS"]))
     except:
diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py 
b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
index 1147fc5..765e9ac 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/vdsm.py
@@ -230,6 +230,7 @@
                 name=self.environment[osetupcons.AIOEnv.LOCAL_HOST],
                 address=self.environment[osetupcons.ConfigEnv.FQDN],
                 reboot_after_installation=False,
+                override_iptables=False,
                 cluster=engine_api.clusters.get(
                     self.environment[osetupcons.AIOEnv.LOCAL_CLUSTER]
                 ),


-- 
To view, visit http://gerrit.ovirt.org/16323
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iceeff7953520edd293fa9f4965608354599669f7
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

Reply via email to