diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-24 13:40:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 13:40:27 -0500 |
| commit | 0516c051463951379399135c24093175f4127c94 (patch) | |
| tree | fcd36be8d04824f818e5daa33736179ca1cc4a8d /roles | |
| parent | 46532d49f6960f437458dcd02d2cd8e9459f98a3 (diff) | |
| parent | 7aacc2d53acb78b29c2d4e1b4908715074cc2caf (diff) | |
| download | openshift-0516c051463951379399135c24093175f4127c94.tar.gz openshift-0516c051463951379399135c24093175f4127c94.tar.bz2 openshift-0516c051463951379399135c24093175f4127c94.tar.xz openshift-0516c051463951379399135c24093175f4127c94.zip | |
Merge pull request #3165 from abutcher/fix-default-iptables-args
[os_firewall] Fix default iptables args.
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/os_firewall/library/os_firewall_manage_iptables.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/os_firewall/library/os_firewall_manage_iptables.py b/roles/os_firewall/library/os_firewall_manage_iptables.py index 4ba38b721..8d4878fa7 100755 --- a/roles/os_firewall/library/os_firewall_manage_iptables.py +++ b/roles/os_firewall/library/os_firewall_manage_iptables.py @@ -224,8 +224,8 @@ class IpTablesManager(object): # pylint: disable=too-many-instance-attributes def gen_cmd(self): cmd = 'iptables' if self.ip_version == 'ipv4' else 'ip6tables' # Include -w (wait for xtables lock) in default arguments. - default_args = '-w' - return ["/usr/sbin/%s %s" % (cmd, default_args)] + default_args = ['-w'] + return ["/usr/sbin/%s" % cmd] + default_args def gen_save_cmd(self): # pylint: disable=no-self-use return ['/usr/libexec/iptables/iptables.init', 'save'] |