valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11104 from sandbender/mydevelop

Browse Source 
Fresh fix commit for saltstack/salt repo issue #11096
This commit is contained in:
Joseph Hall 2014-03-10 15:16:55 -06:00
commit c605f06e89
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/iptables.py
View File

@ -28,9 +28,9 @@ def _iptables_cmd(family='ipv4'):
Return correct command based on the family, eg. ipv4 or ipv6
'''
if family == 'ipv6':
return 'ip6tables'
return salt.utils.which('ip6tables')
else:
return 'iptables'
return salt.utils.which('iptables')
def _conf(family='ipv4'):

2
salt/states/iptables.py
View File

@ -325,7 +325,7 @@ def insert(name, family='ipv4', **kwargs):
if kwargs['save']:
__salt__['iptables.save'](filename=None, family=family)
ret['comment'] = ('Set and Saved iptables rule for {0} to: '
'{1} for {2}'.format(name, command.strip(), family))
'{1} for {2}').format(name, command.strip(), family)
return ret
else:
ret['result'] = False