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

Adding fix for iptables --check that is currently in 2015.2 into develop. Adding a log entry for testing aggregating iptables rules, should show that the save function that writes to disk is only called once and only called when necessary.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2015-03-06 17:23:28 -08:00
parent ad7c0bb26d
commit e82a62b829
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/iptables.py
View File

@ -17,6 +17,9 @@ import salt.utils
from salt.state import STATE_INTERNAL_KEYWORDS as _STATE_INTERNAL_KEYWORDS from salt.state import STATE_INTERNAL_KEYWORDS as _STATE_INTERNAL_KEYWORDS
from salt.exceptions import SaltException from salt.exceptions import SaltException
import logging
log = logging.getLogger(__name__)
def __virtual__(): def __virtual__():
''' '''
@ -427,6 +430,8 @@ def save(filename=None, family='ipv4'):
if _conf() and not filename: if _conf() and not filename:
filename = _conf(family) filename = _conf(family)
log.debug('Saving rules to {0}'.format(filename))
parent_dir = os.path.dirname(filename) parent_dir = os.path.dirname(filename)
if not os.path.isdir(parent_dir): if not os.path.isdir(parent_dir):
os.makedirs(parent_dir) os.makedirs(parent_dir)