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

Set current play/task to None for callback context when finished running the current play/task.

Browse source
This commit is contained in:
Chris Church 2013-06-09 12:17:57 -04:00
parent 6f8e9c1b29
commit 3f17a39238
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,10 +213,7 @@ class PlayBook(object):
self.callbacks.on_start() self.callbacks.on_start()
for (play_ds, play_basedir) in zip(self.playbook, self.play_basedirs): for (play_ds, play_basedir) in zip(self.playbook, self.play_basedirs):
play = Play(self, play_ds, play_basedir) play = Play(self, play_ds, play_basedir)
assert play is not None assert play is not None
ansible.callbacks.set_play(self.callbacks, play)
ansible.callbacks.set_play(self.runner_callbacks, play)
matched_tags, unmatched_tags = play.compare_tags(self.only_tags) matched_tags, unmatched_tags = play.compare_tags(self.only_tags)
matched_tags_all = matched_tags_all | matched_tags matched_tags_all = matched_tags_all | matched_tags
@ -242,8 +239,12 @@ class PlayBook(object):
raise errors.AnsibleError(msg % (unknown, unmatched)) raise errors.AnsibleError(msg % (unknown, unmatched))
for play in plays: for play in plays:
ansible.callbacks.set_play(self.callbacks, play)
ansible.callbacks.set_play(self.runner_callbacks, play)
if not self._run_play(play): if not self._run_play(play):
break break
ansible.callbacks.set_play(self.callbacks, None)
ansible.callbacks.set_play(self.runner_callbacks, None)
# summarize the results # summarize the results
results = {} results = {}
@ -325,6 +326,8 @@ class PlayBook(object):
self.callbacks.on_task_start(template(play.basedir, task.name, task.module_vars, lookup_fatal=False), is_handler) self.callbacks.on_task_start(template(play.basedir, task.name, task.module_vars, lookup_fatal=False), is_handler)
if hasattr(self.callbacks, 'skip_task') and self.callbacks.skip_task: if hasattr(self.callbacks, 'skip_task') and self.callbacks.skip_task:
ansible.callbacks.set_task(self.callbacks, None)
ansible.callbacks.set_task(self.runner_callbacks, None)
return True return True
# load up an appropriate ansible runner to run the task in parallel # load up an appropriate ansible runner to run the task in parallel
@ -365,6 +368,8 @@ class PlayBook(object):
for handler_name in task.notify: for handler_name in task.notify:
self._flag_handler(play, template(play.basedir, handler_name, task.module_vars), host) self._flag_handler(play, template(play.basedir, handler_name, task.module_vars), host)
ansible.callbacks.set_task(self.callbacks, None)
ansible.callbacks.set_task(self.runner_callbacks, None)
return hosts_remaining return hosts_remaining
# ***************************************************** # *****************************************************