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

Merge pull request #10013 from bretep/develop

Browse Source 
Add ability to subfilter in sls files
This commit is contained in:
Thomas S Hatch 2014-01-29 07:46:22 -08:00
commit 6604bfffc8
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
salt/state.py
View File

@ -2044,18 +2044,24 @@ class BaseHighState(object):
if saltenv != self.opts['environment']:
continue
for match, data in body.items():
if isinstance(data, string_types):
data = [data]
if self.matcher.confirm_top(
match,
data,
self.opts['nodegroups']
):
if saltenv not in matches:
matches[saltenv] = []
for item in data:
if isinstance(item, string_types):
matches[saltenv].append(item)
def _filter_matches(_match, _data, _opts):
if isinstance(_data, string_types):
_data = [_data]
if self.matcher.confirm_top(
_match,
_data,
_opts
):
if saltenv not in matches:
matches[saltenv] = []
for item in _data:
if 'subfilter' in item:
_tmpdata = item.pop('subfilter')
for match, data in _tmpdata.items():
_filter_matches(match, data, _opts)
if isinstance(item, string_types):
matches[saltenv].append(item)
_filter_matches(match, data, self.opts['nodegroups'])
ext_matches = self.client.ext_nodes()
for saltenv in ext_matches:
if saltenv in matches: