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

Disable pillar/compound for mine.get, master-side

Browse Source
This commit is contained in:
Colton Myers 2014-10-29 11:25:23 -06:00
parent 868fdc86da
commit 046d7aafe9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/daemons/masterapi.py
View File

@ -488,6 +488,9 @@ class RemoteFuncs(object):
'''
Gathers the data from the specified minions' mine
'''
# Don't allow matching by pillar or compound
if load.get('expr_form', 'glob') in ('compound', 'pillar'):
return {}
if not skip_verify:
if any(key not in load for key in ('id', 'tgt', 'fun')):
return {}
@ -506,7 +509,7 @@ class RemoteFuncs(object):
if not salt.utils.verify.valid_id(self.opts, load['id']):
return ret
checker = salt.utils.minions.CkMinions(self.opts)
minions = checker.check_minions(
einions = checker.check_minions(
load['tgt'],
load.get('expr_form', 'glob'),
greedy=False