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

Merge pull request #13686 from cro/ext_nodes_fail2

Browse Source 
Fix ext_nodes breakage
This commit is contained in:
Thomas S Hatch 2014-06-24 20:13:27 -06:00
commit 8a543e8d1c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/master.py
View File

@ -818,6 +818,7 @@ class AESFuncs(object):
clear_load['tgt'],
clear_load.get('tgt_type', 'glob'))
def _ext_nodes(self, load):
'''
Return the results from an external node classifier if one is
@ -847,11 +848,13 @@ class AESFuncs(object):
)
return {}
load.pop('tok')
ret = {}
# Evaluate all configured master_tops interfaces
ret = {}
opts = {}
grains = {}
if 'opts' in load:
opts = load['opts']
if 'grains' in load['opts']:
@ -871,6 +874,7 @@ class AESFuncs(object):
)
return ret
def _master_opts(self, load):
'''
Return the master options to the minion