Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix return statement where we short circuit _get_delegated_vars #48102

Merged
merged 1 commit into from
Nov 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/loop-cache-include-apply.yml
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion lib/ansible/vars/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ def _get_magic_variables(self, play, host, task, include_hostvars, include_deleg
def _get_delegated_vars(self, play, task, existing_variables):
if not hasattr(task, 'loop'):
# 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,
# as we're fetching vars before post_validate has been called on
Expand Down