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

Here you go @mgwilliams, I have not tested this!!

Browse Source 
But it should not cause any problems, please test it and fix it up!
This commit is contained in:
Thomas S Hatch 2014-06-24 12:09:46 -06:00
parent 432ea22e03
commit 6ae33a4d06
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/state.py
View File

@ -283,7 +283,8 @@ def highstate(test=None, queue=False, **kwargs):
exclude=kwargs.get('exclude', []),
cache=kwargs.get('cache', None),
cache_name=kwargs.get('cache_name', 'highstate'),
force=kwargs.get('force', False)
force=kwargs.get('force', False),
whitelist=kwargs.get('whitelist')
)
finally:
st_.pop_active()

20
salt/state.py
View File

@ -2672,8 +2672,25 @@ class BaseHighState(object):
return False
return True
def matches_whitelist(self, matches, whitelist):
'''
Reads over the matches and returns a matches dict with just the ones
that are in the whitelist
'''
if not whitelist:
return matches
ret_matches = {}
if not isinstance(whitelist, list):
whitelist = whitelist.split(',')
for env in matches:
for sls in env:
if sls in whitelist:
ret_matches[env] = ret_matches[env] if ret_matches[env] else []
ret_matches[env].append(sls)
return ret_matches
def call_highstate(self, exclude=None, cache=None, cache_name='highstate',
force=False):
force=False, whitelist=None):
'''
Run the sequence to execute the salt highstate for this minion
'''
@ -2713,6 +2730,7 @@ class BaseHighState(object):
msg = ('No Top file or external nodes data matches found')
ret[tag_name]['comment'] = msg
return ret
matches = self.matches_whitelist(matches, whitelist)
self.load_dynamic(matches)
if not self._check_pillar(force):
err += ['Pillar failed to render with the following messages:']