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

Fix #1821

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-15 18:47:07 -06:00
parent ff83cdb05d
commit 16c76acdd2
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/master.py
View File

@ -593,8 +593,7 @@ class AESFuncs(object):
# The old ext_nodes method is set to be deprecated in 0.10.4
# and should be removed within 3-5 releases in favor of the
# "master_tops" system
if not self.opts['external_nodes']:
return {}
if self.opts['external_nodes']:
if not salt.utils.which(self.opts['external_nodes']):
log.error(('Specified external nodes controller {0} is not'
' available, please verify that it is installed'
@ -625,11 +624,11 @@ class AESFuncs(object):
grains = {}
if 'opts' in load:
opts = load['opts']
if grains in load['opts']:
if 'grains' in load['opts']:
grains = load['opts']['grains']
for fun in self.tops:
try:
ret.update(self.tops[fun](opts, grains))
ret.update(self.tops[fun](opts=opts, grains=grains))
except Exception as exc:
log.error(
('Top function {0} failed with error {1} for minion '