Ensure we only cache the loop when the task had a loop (#44901)

* Further restrict caching of loop when the task actually had a loop. Fixes #44874

* Extend tests for loop caching
This commit is contained in:
Matt Martz 2018-08-30 12:02:43 -05:00 committed by GitHub
parent 6059da245b
commit 9d89e15ff0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- loop - Ensure we only cache the loop when the task had a loop and delegate_to was templated (https://github.com/ansible/ansible/issues/44874)

View file

@ -494,6 +494,7 @@ class VariableManager:
templar = Templar(loader=self._loader, variables=vars_copy)
items = []
has_loop = True
if task.loop_with is not None:
if task.loop_with in lookup_loader:
try:
@ -509,6 +510,7 @@ class VariableManager:
elif task.loop is not None:
items = templar.template(task.loop)
else:
has_loop = False
items = [None]
delegated_host_vars = dict()
@ -583,7 +585,7 @@ class VariableManager:
include_hostvars=False,
)
if cache_items:
if has_loop and cache_items:
# delegate_to templating produced a change, update task.loop with templated items,
# this ensures that delegate_to+loop doesn't produce different results than TaskExecutor
# which may reprocess the loop

View file

@ -7,6 +7,7 @@
add_host:
name: "foo{{item}}"
groups: foo
ansible_connection: local
loop: "{{ range(10)|list }}"
# We expect all of the next 3 runs to succeeed
@ -56,3 +57,16 @@
- "{{ (result1.results|first) is successful }}"
- "{{ (result2.results|first) is successful }}"
- "{{ (result3.results|first) is successful }}"
- name: Set delegate
set_fact:
_delegate: '{{ groups.foo[0] }}'
- command: "true"
delegate_to: "{{ _delegate }}"
register: result
- assert:
that:
- result.stdout is defined
- result.results is undefined