diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-24 09:52:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 09:52:41 -0500 |
| commit | 182a07ad58972cddb3747a18d6a8e3818492488c (patch) | |
| tree | dd2a9c315c64232203906ac661fa2299cf2543d3 /roles | |
| parent | 8b4c3d65469c444402317eaaecae9e955b4b4f20 (diff) | |
| parent | 86d10d306967922be894ddd19fcf49382a522b75 (diff) | |
| download | openshift-182a07ad58972cddb3747a18d6a8e3818492488c.tar.gz openshift-182a07ad58972cddb3747a18d6a8e3818492488c.tar.bz2 openshift-182a07ad58972cddb3747a18d6a8e3818492488c.tar.xz openshift-182a07ad58972cddb3747a18d6a8e3818492488c.zip | |
Merge pull request #3152 from abutcher/iptables-w
Bug 1415800 - Installer fails to add/check iptables rule due to lock on xtables.
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/os_firewall/library/os_firewall_manage_iptables.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/os_firewall/library/os_firewall_manage_iptables.py b/roles/os_firewall/library/os_firewall_manage_iptables.py index 8ba650994..4ba38b721 100755 --- a/roles/os_firewall/library/os_firewall_manage_iptables.py +++ b/roles/os_firewall/library/os_firewall_manage_iptables.py @@ -223,7 +223,9 @@ class IpTablesManager(object): # pylint: disable=too-many-instance-attributes def gen_cmd(self): cmd = 'iptables' if self.ip_version == 'ipv4' else 'ip6tables' - return ["/usr/sbin/%s" % cmd] + # Include -w (wait for xtables lock) in default arguments. + default_args = '-w' + return ["/usr/sbin/%s %s" % (cmd, default_args)] def gen_save_cmd(self): # pylint: disable=no-self-use return ['/usr/libexec/iptables/iptables.init', 'save'] |