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

Fix return statement where we short circuit _get_delegated_vars (#48102)

Browse source
This commit is contained in:
Matt Martz 2018-11-05 12:28:34 -06:00 committed by GitHub
parent df6b0b0e9e
commit cb5626cc09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/loop-cache-include-apply.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- delegate_to - Fix issue where delegate_to was upplied via ``apply`` on an include, where a loop was present on the include

2
lib/ansible/vars/manager.py
View file

@ -489,7 +489,7 @@ class VariableManager:
def _get_delegated_vars(self, play, task, existing_variables): def _get_delegated_vars(self, play, task, existing_variables):
if not hasattr(task, 'loop'): if not hasattr(task, 'loop'):
# This "task" is not a Task, so we need to skip it # This "task" is not a Task, so we need to skip it
return {} return {}, None
# we unfortunately need to template the delegate_to field here, # we unfortunately need to template the delegate_to field here,
# as we're fetching vars before post_validate has been called on # as we're fetching vars before post_validate has been called on