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

avoid errors when dynamic role

Browse source 
(cherry picked from commit 6f2936e57b268e9f8a2ed5c23c6af49888f869ae)
This commit is contained in:
Brian Coca 2016-10-14 18:03:13 -04:00
parent 141ed26e02
commit d4b8178b4b
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -416,14 +416,10 @@ class TaskExecutor:
include_file = templar.template(include_file)
return dict(include=include_file, include_variables=include_variables)
# TODO: not needed?
# if this task is a IncludeRole, we just return now with a success code so the main thread can expand the task list for the given host
elif self._task.action == 'include_role':
include_variables = self._task.args.copy()
role = templar.template(self._task._role_name)
if not role:
return dict(failed=True, msg="No role was specified to include")
return dict(include_role=role, include_variables=include_variables)
return dict(include_role=self._task, include_variables=include_variables)
# Now we do final validation on the task, which sets all fields to their final values.
self._task.post_validate(templar=templar)