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

Don't assume handlers exist in the same role (if any)

Browse source 
Fixes #12536
This commit is contained in:
James Cammarata 2015-09-29 12:29:02 -04:00
parent 8095b027bf
commit a3e913da62
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/executor/process/result.py
View file

@ -142,9 +142,6 @@ class ResultProcess(multiprocessing.Process):
# So, per the docs, we reassign the list so the proxy picks up and # So, per the docs, we reassign the list so the proxy picks up and
# notifies all other threads # notifies all other threads
for notify in result_item['_ansible_notify']: for notify in result_item['_ansible_notify']:
if result._task._role:
role_name = result._task._role.get_name()
notify = "%s : %s" % (role_name, notify)
self._send_result(('notify_handler', result, notify)) self._send_result(('notify_handler', result, notify))
# now remove the notify field from the results, as its no longer needed # now remove the notify field from the results, as its no longer needed
result_item.pop('_ansible_notify') result_item.pop('_ansible_notify')

2
lib/ansible/playbook/included_file.py
View file

@ -48,7 +48,7 @@ class IncludedFile:
for res in results: for res in results:
if res._host.name in tqm._failed_hosts: if res._host.name in tqm._failed_hosts:
raise AnsibleError("host is failed, not including files") continue
if res._task.action == 'include': if res._task.action == 'include':
if res._task.loop: if res._task.loop:

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

@ -237,6 +237,7 @@ class StrategyBase:
if task_result._host not in self._notified_handlers[handler_name]: if task_result._host not in self._notified_handlers[handler_name]:
self._notified_handlers[handler_name].append(task_result._host) self._notified_handlers[handler_name].append(task_result._host)
self._display.vv("NOTIFIED HANDLER %s" % (handler_name,))
elif result[0] == 'register_host_var': elif result[0] == 'register_host_var':
# essentially the same as 'set_host_var' below, however we # essentially the same as 'set_host_var' below, however we
@ -447,6 +448,12 @@ class StrategyBase:
handler_vars = self._variable_manager.get_vars(loader=self._loader, play=iterator._play, task=handler) handler_vars = self._variable_manager.get_vars(loader=self._loader, play=iterator._play, task=handler)
templar = Templar(loader=self._loader, variables=handler_vars) templar = Templar(loader=self._loader, variables=handler_vars)
try: try:
# first we check with the full result of get_name(), which may
# include the role name (if the handler is from a role). If that
# is not found, we resort to the simple name field, which doesn't
# have anything extra added to it.
handler_name = templar.template(handler.name)
if handler_name not in self._notified_handlers:
handler_name = templar.template(handler.get_name()) handler_name = templar.template(handler.get_name())
except (UndefinedError, AnsibleUndefinedVariable): except (UndefinedError, AnsibleUndefinedVariable):
# We skip this handler due to the fact that it may be using # We skip this handler due to the fact that it may be using
@ -454,8 +461,8 @@ class StrategyBase:
# set_fact or some other method, and we don't want to error # set_fact or some other method, and we don't want to error
# out unnecessarily # out unnecessarily
continue continue
should_run = handler_name in self._notified_handlers and len(self._notified_handlers[handler_name])
if should_run: if handler_name in self._notified_handlers and len(self._notified_handlers[handler_name]):
result = self._do_handler_run(handler, handler_name, 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