cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

now only flattened ignores failonundefined cause of it's special need

Browse source
This commit is contained in:
Brian Coca 2014-11-25 16:12:15 -05:00
parent e3feb104c3
commit db145a368d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/runner/lookup_plugins/flattened.py
View file

@ -50,7 +50,7 @@ class LookupModule(object):
if isinstance(term, basestring):
# convert a variable to a list
term2 = utils.listify_lookup_plugin_terms(term, self.basedir, inject)
term2 = utils.listify_lookup_plugin_terms(term, self.basedir, inject, fail_on_undefined=False)
# but avoid converting a plain string to a list of one string
if term2 != [ term ]:
term = term2

4
lib/ansible/utils/__init__.py
View file

@ -1451,7 +1451,7 @@ def safe_eval(expr, locals={}, include_exceptions=False):
return expr
def listify_lookup_plugin_terms(terms, basedir, inject):
def listify_lookup_plugin_terms(terms, basedir, inject, fail_on_undefined=C.DEFAULT_UNDEFINED_VAR_BEHAVIOR):
from ansible.utils import template
@ -1469,7 +1469,7 @@ def listify_lookup_plugin_terms(terms, basedir, inject):
# if not already a list, get ready to evaluate with Jinja2
# not sure why the "/" is in above code :)
try:
new_terms = template.template(basedir, "{{%s}}" % terms, inject, convert_bare=True)
new_terms = template.template(basedir, "{{%s}}" % terms, inject, convert_bare=True, fail_on_undefined=fail_on_undefined)
if isinstance(new_terms, basestring) and "{{" in new_terms:
pass
else: