wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

(cherry picked from commit ddf937d642)

* Add changelog for #38194
This commit is contained in:
Matt Martz 2018-04-05 11:29:01 -05:00 committed by Sam Doran
parent 63566334f6
commit 8277989039
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/include_vars_error_hang_fix.yaml Normal file
View file

@ -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)

2
lib/ansible/plugins/action/include_vars.py
View file

@ -236,7 +236,7 @@ class ActionModule(ActionBase):
data = to_text(b_data, errors='surrogate_or_strict')
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:
data = dict()
if not isinstance(data, dict):