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

Avoid templating raw lookup strings

Browse source
This commit is contained in:
James Cammarata 2014-07-28 16:21:37 -05:00
parent 5ce142a3b6
commit a45c3b84f3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/runner/action_plugins/debug.py
View file

@ -50,7 +50,7 @@ class ActionModule(object):
result = dict(failed=True, msg=args['msg']) result = dict(failed=True, msg=args['msg'])
else: else:
result = dict(msg=args['msg']) 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) results = template.template(self.basedir, "{{ %s }}" % args['var'], inject)
result[args['var']] = results result[args['var']] = results

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

@ -1257,7 +1257,10 @@ def listify_lookup_plugin_terms(terms, basedir, inject):
# with_items: {{ alist }} # with_items: {{ alist }}
stripped = terms.strip() 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 # if not already a list, get ready to evaluate with Jinja2
# not sure why the "/" is in above code :) # not sure why the "/" is in above code :)
try: try: