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

Revert back to copying self._task.args

Browse source
This commit is contained in:
Victor Salgado 2015-10-20 16:19:38 -02:00
parent 0e671baa33
commit c5c5f3bf7a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/executor/task_executor.py
View file

@ -282,12 +282,13 @@ class TaskExecutor:
# if this task is a TaskInclude, we just return now with a success code so the # if this task is a TaskInclude, we just return now with a success code so the
# main thread can expand the task list for the given host # main thread can expand the task list for the given host
if self._task.action == 'include': if self._task.action == 'include':
include_file = self._task.args.pop('_raw_params', None) include_variables = self._task.args.copy()
include_file = include_variables.pop('_raw_params', None)
if not include_file: if not include_file:
return dict(failed=True, msg="No include file was specified to the include") return dict(failed=True, msg="No include file was specified to the include")
else:
include_file = templar.template(include_file) include_file = templar.template(include_file)
return dict(include=include_file, include_variables=self._task.args) return dict(include=include_file, include_variables=include_variables)
# Now we do final validation on the task, which sets all fields to their final values. # Now we do final validation on the task, which sets all fields to their final values.
# In the case of debug tasks, we save any 'var' params and restore them after validating # In the case of debug tasks, we save any 'var' params and restore them after validating