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

Template handler names before checking to see if they need to run

Browse source 
Fixes #12427
This commit is contained in:
James Cammarata 2015-09-18 18:54:48 -04:00
parent 72769d1899
commit 05f6e76407
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/plugins/strategy/__init__.py
View file

@ -464,14 +464,17 @@ class StrategyBase:
# but this may take some work in the iterator and gets tricky when # but this may take some work in the iterator and gets tricky when
# we consider the ability of meta tasks to flush handlers # we consider the ability of meta tasks to flush handlers
for handler in handler_block.block: for handler in handler_block.block:
should_run = handler.get_name() in self._notified_handlers and len(self._notified_handlers[handler.get_name()]) handler_vars = self._variable_manager.get_vars(loader=self._loader, play=iterator._play, task=handler)
templar = Templar(loader=self._loader, variables=handler_vars)
handler_name = templar.template(handler.get_name())
should_run = handler_name in self._notified_handlers and len(self._notified_handlers[handler_name])
if should_run: if should_run:
result = self._do_handler_run(handler, iterator=iterator, play_context=play_context) result = self._do_handler_run(handler, handler_name, iterator=iterator, play_context=play_context)
if not result: if not result:
break break
return result return result
def _do_handler_run(self, handler, iterator, play_context, notified_hosts=None): def _do_handler_run(self, handler, handler_name, iterator, play_context, notified_hosts=None):
# FIXME: need to use iterator.get_failed_hosts() instead? # FIXME: need to use iterator.get_failed_hosts() instead?
#if not len(self.get_hosts_remaining(iterator._play)): #if not len(self.get_hosts_remaining(iterator._play)):
@ -481,7 +484,7 @@ class StrategyBase:
self._tqm.send_callback('v2_playbook_on_handler_task_start', handler) self._tqm.send_callback('v2_playbook_on_handler_task_start', handler)
if notified_hosts is None: if notified_hosts is None:
notified_hosts = self._notified_handlers[handler.get_name()] notified_hosts = self._notified_handlers[handler_name]
host_results = [] host_results = []
for host in notified_hosts: for host in notified_hosts:
@ -530,7 +533,7 @@ class StrategyBase:
continue continue
# wipe the notification list # wipe the notification list
self._notified_handlers[handler.get_name()] = [] self._notified_handlers[handler_name] = []
self._display.debug("done running handlers, result is: %s" % result) self._display.debug("done running handlers, result is: %s" % result)
return result return result