fine tuned lookup/templating errors

This commit is contained in:
Brian Coca
2014-11-26 22:06:37 -05:00
parent 704f7d7b40
commit 9a5cbf747a
3 changed files with 10 additions and 6 deletions

View File

@@ -86,12 +86,14 @@ JINJA2_ALLOWED_OVERRIDES = ['trim_blocks', 'lstrip_blocks', 'newline_sequence',
def lookup(name, *args, **kwargs):
from ansible import utils
instance = utils.plugins.lookup_loader.get(name.lower(), basedir=kwargs.get('basedir',None))
vars = kwargs.get('vars', None)
tvars = kwargs.get('vars', None)
if instance is not None:
# safely catch run failures per #5059
try:
ran = instance.run(*args, inject=vars, **kwargs)
ran = instance.run(*args, inject=tvars, **kwargs)
except errors.AnsibleUndefinedVariable:
raise
except Exception, e:
ran = None
if ran: