diff options
| author | Matt Martz <matt@sivel.net> | 2018-09-07 10:16:03 -0500 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-09-07 13:01:55 -0700 |
| commit | 3e14a34744a271522e101024cdc285f2967acd08 (patch) | |
| tree | 58e4ab600d52457d523633a4893b6d24f473eef6 | |
| parent | 1301d4edc8a4fbfbb0b988eb62cd3f4583648029 (diff) | |
| download | ansible-3e14a34744a271522e101024cdc285f2967acd08.tar.gz | |
[stable-2.7] Ensure loop with delegate_to can short circuit the same as without delegate_to. Fixes #45189 (#45231)
(cherry picked from commit 2ac647d)
Co-authored-by: Matt Martz <matt@sivel.net>
| -rw-r--r-- | changelogs/fragments/loop_undefined_delegate_to.yaml | 4 | ||||
| -rw-r--r-- | lib/ansible/vars/manager.py | 7 | ||||
| -rw-r--r-- | test/integration/targets/loops/tasks/main.yml | 19 |
3 files changed, 29 insertions, 1 deletions
diff --git a/changelogs/fragments/loop_undefined_delegate_to.yaml b/changelogs/fragments/loop_undefined_delegate_to.yaml new file mode 100644 index 0000000000..e7e81d2b3d --- /dev/null +++ b/changelogs/fragments/loop_undefined_delegate_to.yaml @@ -0,0 +1,4 @@ +bugfixes: +- loop - Ensure that a loop with a when condition that evaluates to false and delegate_to, will short circuit if the + loop references an undefined variable. This matches the behavior in the same scenario without delegate_to + (https://github.com/ansible/ansible/issues/45189) diff --git a/lib/ansible/vars/manager.py b/lib/ansible/vars/manager.py index 921e63d92a..a88b7ae996 100644 --- a/lib/ansible/vars/manager.py +++ b/lib/ansible/vars/manager.py @@ -512,7 +512,12 @@ class VariableManager: else: raise AnsibleError("Failed to find the lookup named '%s' in the available lookup plugins" % task.loop_with) elif task.loop is not None: - items = templar.template(task.loop) + try: + items = templar.template(task.loop) + except AnsibleUndefinedVariable: + # 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] else: has_loop = False items = [None] diff --git a/test/integration/targets/loops/tasks/main.yml b/test/integration/targets/loops/tasks/main.yml index 8b1d635e6e..1b8a745050 100644 --- a/test/integration/targets/loops/tasks/main.yml +++ b/test/integration/targets/loops/tasks/main.yml @@ -233,3 +233,22 @@ - assert: that: - ansible_search_path == loop_search_path.results.0.item + +# https://github.com/ansible/ansible/issues/45189 +- name: with_X conditional delegate_to shortcircuit on templating error + debug: + msg: "loop" + when: false + delegate_to: localhost + with_list: "{{ fake_var }}" + register: result + failed_when: result is not skipped + +- name: loop conditional delegate_to shortcircuit on templating error + debug: + msg: "loop" + when: false + delegate_to: localhost + loop: "{{ fake_var }}" + register: result + failed_when: result is not skipped |