diff options
| author | Chris Church <chris@ninemoreminutes.com> | 2013-06-09 12:17:57 -0400 |
|---|---|---|
| committer | Chris Church <chris@ninemoreminutes.com> | 2013-06-09 12:17:57 -0400 |
| commit | 3f17a39238f7aaaebaf33ffe5f29884d0f732765 (patch) | |
| tree | 33e32fd0a49d9cea86866f3745805c0489838dfc | |
| parent | 6f8e9c1b29b8fb8bd4b097ec40a750c70be0a4b4 (diff) | |
| download | ansible-3f17a39238f7aaaebaf33ffe5f29884d0f732765.tar.gz | |
Set current play/task to None for callback context when finished running the current play/task.
| -rw-r--r-- | lib/ansible/playbook/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index c2e43187ce..8b69d19a0e 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -213,10 +213,7 @@ class PlayBook(object): self.callbacks.on_start() for (play_ds, play_basedir) in zip(self.playbook, self.play_basedirs): play = Play(self, play_ds, play_basedir) - 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_all = matched_tags_all | matched_tags @@ -242,8 +239,12 @@ class PlayBook(object): raise errors.AnsibleError(msg % (unknown, unmatched)) 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): break + ansible.callbacks.set_play(self.callbacks, None) + ansible.callbacks.set_play(self.runner_callbacks, None) # summarize the 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) 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 # 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: 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 # ***************************************************** |