ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Flush handlers before pre and post task sections change, but not between task and roles, as this seems

Browse source 
to be confusing to people (and not usually neccessary)
This commit is contained in:
Michael DeHaan 2013-04-24 22:28:06 -04:00
parent 6fdfbb1a34
commit 21fe750cef
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/playbook/__init__.py
View file

@ -224,9 +224,9 @@ class PlayBook(object):
# if we have matched_tags, the play must be run. # if we have matched_tags, the play must be run.
# if the play contains no tasks, assume we just want to gather facts # if the play contains no tasks, assume we just want to gather facts
# in this case there are actually 4 meta tasks (handler flushes) not 0 # in this case there are actually 3 meta tasks (handler flushes) not 0
# tasks, so that's why there's a check against 4. # tasks, so that's why there's a check against 3
if (len(matched_tags) > 0 or len(play.tasks()) == 4): if (len(matched_tags) > 0 or len(play.tasks()) == 3):
plays.append(play) plays.append(play)
# if the playbook is invoked with --tags that don't exist at all in the playbooks # if the playbook is invoked with --tags that don't exist at all in the playbooks

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

@ -140,6 +140,8 @@ class Play(object):
pre_tasks = [] pre_tasks = []
for x in pre_tasks: for x in pre_tasks:
new_tasks.append(x) new_tasks.append(x)
# flush handlers after pre_tasks
new_tasks.append(dict(meta='flush_handlers')) new_tasks.append(dict(meta='flush_handlers'))
# variables if the role was parameterized (i.e. given as a hash) # variables if the role was parameterized (i.e. given as a hash)
@ -201,10 +203,11 @@ class Play(object):
if type(post_tasks) != list: if type(post_tasks) != list:
post_tasks = [] post_tasks = []
new_tasks.append(dict(meta='flush_handlers'))
new_tasks.extend(tasks) new_tasks.extend(tasks)
# flush handlers after tasks + role tasks
new_tasks.append(dict(meta='flush_handlers')) new_tasks.append(dict(meta='flush_handlers'))
new_tasks.extend(post_tasks) new_tasks.extend(post_tasks)
# flush handlers after post tasks
new_tasks.append(dict(meta='flush_handlers')) new_tasks.append(dict(meta='flush_handlers'))
new_handlers.extend(handlers) new_handlers.extend(handlers)
new_vars_files.extend(vars_files) new_vars_files.extend(vars_files)