[stable-2.7] Fix return statement where we short circuit _get_delegated_vars (#48102)

(cherry picked from commit cb5626c)

Co-authored-by: Matt Martz <matt@sivel.net>
This commit is contained in:
Matt Martz 2018-11-05 12:28:34 -06:00 committed by Toshio Kuratomi
parent 5dfd7c181f
commit 0be3307bac
2 changed files with 3 additions and 1 deletions

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

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