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

properly propagate loop vars

Browse source 
fixes #17966

(cherry picked from commit 99220a5f6c)
This commit is contained in:
Brian Coca 2016-10-18 15:26:46 -04:00
parent 885b218a7b
commit fb921042db
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/strategy/linear.py
View file

@ -295,13 +295,12 @@ class StrategyModule(StrategyBase):
if 'skipped' in include_result and include_result['skipped'] or 'failed' in include_result and include_result['failed']:
continue
role_vars = include_result.get('include_variables', dict())
if loop_var and loop_var in include_result:
role_vars[loop_var] = include_result[loop_var]
display.debug("generating all_blocks data for role")
new_ir = hr._task.copy()
new_ir.args.update(role_vars)
new_ir.vars.update(include_result.get('include_variables', dict()))
if loop_var and loop_var in include_result:
new_ir.vars[loop_var] = include_result[loop_var]
all_role_blocks.extend(new_ir.get_block_list(play=iterator._play, variable_manager=self._variable_manager, loader=self._loader))
if len(all_role_blocks) > 0: