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

kisoku · Nov 25, 2014 · db145a3 · db145a3
1 parent e3feb10
commit db145a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/ansible/runner/lookup_plugins/flattened.py b/lib/ansible/runner/lookup_plugins/flattened.py
@@ -50,7 +50,7 @@ def flatten(self, terms, inject):
 
             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

diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py
@@ -1451,7 +1451,7 @@ def generic_visit(self, node, inside_call=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: