Backport #38194 for 2.5 - include_vars error fix (#38225)

* Don't pass keyword args as positional, include file_name. Fixes #38190 (#38194)

(cherry picked from commit ddf937d642)

* Add changelog for #38194
pull/38350/head
Matt Martz 7 years ago committed by Sam Doran
parent 63566334f6
commit 8277989039

@ -0,0 +1,2 @@
bugfixes:
- include_vars - Call DataLoader.load with the correct signature to prevent hang on error processing (https://github.com/ansible/ansible/pull/38194)

@ -236,7 +236,7 @@ class ActionModule(ActionBase):
data = to_text(b_data, errors='surrogate_or_strict') data = to_text(b_data, errors='surrogate_or_strict')
self.show_content = show_content self.show_content = show_content
data = self._loader.load(data, show_content) data = self._loader.load(data, file_name=filename, show_content=show_content)
if not data: if not data:
data = dict() data = dict()
if not isinstance(data, dict): if not isinstance(data, dict):

Loading…
Cancel
Save