diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-01-23 14:24:56 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2017-01-23 14:29:49 -0500 |
| commit | 86d10d306967922be894ddd19fcf49382a522b75 (patch) | |
| tree | d7d158b62ca049b01d572d793e7097dd5a210046 | |
| parent | 30b1000c0f8a7347937eb9b02554e5126864a2b5 (diff) | |
| download | openshift-86d10d306967922be894ddd19fcf49382a522b75.tar.gz openshift-86d10d306967922be894ddd19fcf49382a522b75.tar.bz2 openshift-86d10d306967922be894ddd19fcf49382a522b75.tar.xz openshift-86d10d306967922be894ddd19fcf49382a522b75.zip | |
[os_firewall] Add -w flag to wait for iptables xtables lock.
| -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'] |