diff options
author | Brian Coca <brian.coca+git@gmail.com> | 2015-06-11 00:13:40 -0400 |
---|---|---|
committer | Brian Coca <brian.coca+git@gmail.com> | 2015-06-11 00:13:40 -0400 |
commit | 7291f9e96586b2ffa9f0bd110d62b5b0477d0fd6 (patch) | |
tree | e11a1bf09ca0f33b21c3b96be47fe7d6bdada10f /lib/ansible/utils | |
parent | f29c1c7452c1b387e5719197fc8b68ac7eb4ad12 (diff) | |
download | ansible-7291f9e96586b2ffa9f0bd110d62b5b0477d0fd6.tar.gz |
removed cruft
made sure it does not fail on undefined
Diffstat (limited to 'lib/ansible/utils')
-rw-r--r-- | lib/ansible/utils/listify.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/ansible/utils/listify.py b/lib/ansible/utils/listify.py index c8fc97bed7..dfc8012042 100644 --- a/lib/ansible/utils/listify.py +++ b/lib/ansible/utils/listify.py @@ -19,24 +19,23 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from six import iteritems, string_types - -import re from ansible.template import Templar from ansible.template.safe_eval import safe_eval __all__ = ['listify_lookup_plugin_terms'] -LOOKUP_REGEX = re.compile(r'lookup\s*\(') - +#FIXME: probably just move this into lookup plugin base class def listify_lookup_plugin_terms(terms, variables, loader): if isinstance(terms, basestring): stripped = terms.strip() templar = Templar(loader=loader, variables=variables) - terms = templar.template(terms, convert_bare=True) + #FIXME: warn/deprecation on bare vars in with_ so we can eventually remove fail on undefined override + terms = templar.template(terms, convert_bare=True, fail_on_undefined=False) + + #TODO: check if this is needed as template should also return correct type already terms = safe_eval(terms) if isinstance(terms, basestring): |