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 #38823 from gtmanfred/2016.3

Browse source 
pass pillar to compound matcher in match module
This commit is contained in:
Mike Place 2017-01-20 12:19:09 -07:00 • committed by GitHub
commit dfe6dfe963
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/modules/match.py
View file

@ -37,7 +37,7 @@ def compound(tgt, minion_id=None):
salt '*' match.compound 'L@cheese,foo and *'
'''
opts = {'grains': __grains__}
opts = {'grains': __grains__, 'pillar': __pillar__}
if minion_id is not None:
if not isinstance(minion_id, string_types):
minion_id = str(minion_id)