summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-07-28 16:21:37 -0500
committerJames Cammarata <jimi@sngx.net>2014-08-06 13:25:06 -0500
commit650e967b30f26c285441fb848a408044c51ad622 (patch)
treed27f0d3409fb4f85576c7744456fbb5b3d2a3ba7
parent953a2dfb8a90ed232e3fd3594256dc28589f3ce0 (diff)
downloadansible-650e967b30f26c285441fb848a408044c51ad622.tar.gz
Avoid templating raw lookup strings
-rw-r--r--lib/ansible/runner/action_plugins/debug.py2
-rw-r--r--lib/ansible/utils/__init__.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/ansible/runner/action_plugins/debug.py b/lib/ansible/runner/action_plugins/debug.py
index d2c0a980ab..9882095657 100644
--- a/lib/ansible/runner/action_plugins/debug.py
+++ b/lib/ansible/runner/action_plugins/debug.py
@@ -50,7 +50,7 @@ class ActionModule(object):
result = dict(failed=True, msg=args['msg'])
else:
result = dict(msg=args['msg'])
- elif 'var' in args:
+ elif 'var' in args and not utils.LOOKUP_REGEX.search(args['var']):
results = template.template(self.basedir, "{{ %s }}" % args['var'], inject)
result[args['var']] = results
diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py
index 83b80ab885..5da39acab7 100644
--- a/lib/ansible/utils/__init__.py
+++ b/lib/ansible/utils/__init__.py
@@ -1257,7 +1257,10 @@ def listify_lookup_plugin_terms(terms, basedir, inject):
# with_items: {{ alist }}
stripped = terms.strip()
- if not (stripped.startswith('{') or stripped.startswith('[')) and not stripped.startswith("/") and not stripped.startswith('set(['):
+ if not (stripped.startswith('{') or stripped.startswith('[')) and \
+ not stripped.startswith("/") and \
+ not stripped.startswith('set([') and \
+ not LOOKUP_REGEX.search(terms):
# if not already a list, get ready to evaluate with Jinja2
# not sure why the "/" is in above code :)
try: