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 #28021 from blueyed/recursive-include

Browse Source 
Handle includes in `include_config` recursively
This commit is contained in:
Mike Place 2015-10-20 10:19:37 -06:00
commit 858875e9fd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/config.py
View File

@ -1497,7 +1497,14 @@ def include_config(include, orig_path, verbose):
for fn_ in sorted(glob.glob(path)):
log.debug('Including configuration from {0!r}'.format(fn_))
salt.utils.dictupdate.update(configuration, _read_conf_file(fn_))
opts = _read_conf_file(fn_)
include = opts.get('include', [])
if include:
opts.update(include_config(include, fn_, verbose))
salt.utils.dictupdate.update(configuration, opts)
return configuration