diff options
| author | Matt Martz <matt@sivel.net> | 2019-01-04 14:33:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 14:33:05 -0600 |
| commit | 9abeecb6d4b55e1ba7b0c5ea4b26c5a7aa506219 (patch) | |
| tree | 381d94b568b23c04e738ba203197f77e1f8e0912 /lib/ansible/vars | |
| parent | 96f7cf394fe266b864f4889e2dcf1e8ecf045e6b (diff) | |
| download | ansible-9abeecb6d4b55e1ba7b0c5ea4b26c5a7aa506219.tar.gz | |
Add new AnsibleTemplateError to more easily catch templating issues (#50563)
* Add new AnsibleTemplateError to more easily catch templating issues. Fixes #50154
* Add changelog fragment
Diffstat (limited to 'lib/ansible/vars')
| -rw-r--r-- | lib/ansible/vars/manager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/vars/manager.py b/lib/ansible/vars/manager.py index 0bfc345c9c..83a61d5e31 100644 --- a/lib/ansible/vars/manager.py +++ b/lib/ansible/vars/manager.py @@ -32,7 +32,7 @@ except ImportError: from jinja2.exceptions import UndefinedError from ansible import constants as C -from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVariable, AnsibleFileNotFound, AnsibleAssertionError +from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVariable, AnsibleFileNotFound, AnsibleAssertionError, AnsibleTemplateError from ansible.inventory.host import Host from ansible.inventory.helpers import sort_groups, get_group_vars from ansible.module_utils._text import to_native @@ -519,7 +519,7 @@ class VariableManager: loop_terms = listify_lookup_plugin_terms(terms=task.loop, templar=self._templar, loader=self._loader, fail_on_undefined=True, convert_bare=False) items = lookup_loader.get(task.loop_with, loader=self._loader, templar=self._templar).run(terms=loop_terms, variables=vars_copy) - except AnsibleUndefinedVariable: + except AnsibleTemplateError: # This task will be skipped later due to this, so we just setup # a dummy array for the later code so it doesn't fail items = [None] @@ -528,7 +528,7 @@ class VariableManager: elif task.loop is not None: try: items = self._templar.template(task.loop) - except AnsibleUndefinedVariable: + except AnsibleTemplateError: # This task will be skipped later due to this, so we just setup # a dummy array for the later code so it doesn't fail items = [None] |