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

Fix tag handling on meta:flush_handlers tasks

Browse source 
Fixes #10758
This commit is contained in:
James Cammarata 2015-04-17 13:00:25 -05:00
parent 8f4c97fdbe
commit 763f44a52b
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/playbook/play.py
View file

@ -590,15 +590,17 @@ class Play(object):
included_become_vars[k] = become_vars[k]
x[k] = become_vars[k]
if 'meta' in x:
if x['meta'] == 'flush_handlers':
results.append(Task(self, x))
continue
task_vars = vars.copy()
if original_file:
task_vars['_original_file'] = original_file
if 'meta' in x:
if x['meta'] == 'flush_handlers':
if role_name and 'role_name' not in x:
x['role_name'] = role_name
results.append(Task(self, x, module_vars=task_vars, role_name=role_name))
continue
if 'include' in x:
tokens = split_args(str(x['include']))
included_additional_conditions = list(additional_conditions)

2
lib/ansible/playbook/task.py
View file

@ -52,6 +52,8 @@ class Task(object):
if 'meta' in ds:
self.meta = ds['meta']
self.tags = []
self.module_vars = module_vars
self.role_name = role_name
return
else:
self.meta = None