From c1fe7aa322580b84338d9b0ecdd74fd6e5912b44 Mon Sep 17 00:00:00 2001 From: Michael Schmid Date: Sun, 22 May 2016 15:43:44 +0200 Subject: [PATCH] Fixes #15915: New HandlerTaskInclude Class which can run TaskIncludes inside Handlers --- lib/ansible/playbook/handler_task_include.py | 33 ++++++++++++++++++++ lib/ansible/playbook/helpers.py | 19 ++++++----- 2 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 lib/ansible/playbook/handler_task_include.py diff --git a/lib/ansible/playbook/handler_task_include.py b/lib/ansible/playbook/handler_task_include.py new file mode 100644 index 00000000000..e64c1aaa8c0 --- /dev/null +++ b/lib/ansible/playbook/handler_task_include.py @@ -0,0 +1,33 @@ +# (c) 2012-2014, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +# Make coding more python3-ish +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + +from ansible.errors import AnsibleError +#from ansible.inventory.host import Host +from ansible.playbook.task_include import TaskInclude +from ansible.playbook.handler import Handler + +class HandlerTaskInclude(Handler, TaskInclude): + + @staticmethod + def load(data, block=None, role=None, task_include=None, variable_manager=None, loader=None): + t = HandlerTaskInclude(block=block, role=role, task_include=task_include) + return t.load_data(data, variable_manager=variable_manager, loader=loader) + diff --git a/lib/ansible/playbook/helpers.py b/lib/ansible/playbook/helpers.py index 05556f3aa36..9605c5f0c4a 100644 --- a/lib/ansible/playbook/helpers.py +++ b/lib/ansible/playbook/helpers.py @@ -38,7 +38,7 @@ def load_list_of_blocks(ds, play, parent_block=None, role=None, task_include=Non return a list of Block() objects, where implicit blocks are created for each bare Task. ''' - + # we import here to prevent a circular dependency with imports from ansible.playbook.block import Block @@ -81,6 +81,7 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h from ansible.playbook.handler import Handler from ansible.playbook.task import Task from ansible.playbook.task_include import TaskInclude + from ansible.playbook.handler_task_include import HandlerTaskInclude from ansible.template import Templar assert isinstance(ds, list) @@ -103,8 +104,10 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h task_list.append(t) else: if 'include' in task_ds: - t = TaskInclude.load(task_ds, block=block, role=role, task_include=task_include, variable_manager=variable_manager, loader=loader) - + if use_handlers: + t = HandlerTaskInclude.load(task_ds, block=block, role=role, task_include=task_include, variable_manager=variable_manager, loader=loader) + else: + t = TaskInclude.load(task_ds, block=block, role=role, task_include=task_include, variable_manager=variable_manager, loader=loader) all_vars = variable_manager.get_vars(loader=loader, play=play, task=t) templar = Templar(loader=loader, variables=all_vars) @@ -121,7 +124,7 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h if t.loop is not None: raise AnsibleParserError("You cannot use 'static' on an include with a loop", obj=task_ds) - # FIXME: all of this code is very similar (if not identical) to that in + # FIXME: all of this code is very similar (if not identical) to that in # plugins/strategy/__init__.py, and should be unified to avoid # patches only being applied to one or the other location if task_include: @@ -233,11 +236,11 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h task_list.extend(included_blocks) else: task_list.append(t) - elif use_handlers: - t = Handler.load(task_ds, block=block, role=role, task_include=task_include, variable_manager=variable_manager, loader=loader) - task_list.append(t) else: - t = Task.load(task_ds, block=block, role=role, task_include=task_include, variable_manager=variable_manager, loader=loader) + if use_handlers: + t = Handler.load(task_ds, block=block, role=role, task_include=task_include, variable_manager=variable_manager, loader=loader) + else: + t = Task.load(task_ds, block=block, role=role, task_include=task_include, variable_manager=variable_manager, loader=loader) task_list.append(t) return task_list