saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #41991 from Da-Juan/fix-state_aggregate-list

Browse source 
Accept a list for state_aggregate global setting
This commit is contained in:
Erik Johnson 2017-06-28 19:58:59 -05:00 • committed by GitHub
commit a7f38929cb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/state.py
View file

@ -766,7 +766,7 @@ class State(object):
agg_opt = low['aggregate']
if agg_opt is True:
agg_opt = [low['state']]
else:
elif not isinstance(agg_opt, list):
return low
if low['state'] in agg_opt and not low.get('__agg__'):
agg_fun = '{0}.mod_aggregate'.format(low['state'])