properly propagate loop vars

fixes ansible#17966
sereinity-forks · Oct 18, 2016 · 99220a5 · 99220a5
1 parent 001e2b5
commit 99220a5
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/ansible/plugins/strategy/linear.py b/lib/ansible/plugins/strategy/linear.py
@@ -295,13 +295,12 @@ def run(self, iterator, play_context):
                             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: