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

Fix nonexistent module_name in callbacks (#23587)

Browse source
This commit is contained in:
Antoine Cotten 2017-04-17 21:16:19 +02:00 committed by Matt Davis
parent b8507b676b
commit 7c308b3f8c
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/plugins/callback/foreman.py
View file

@ -189,10 +189,8 @@ class CallbackModule(CallbackBase):
def v2_runner_on_ok(self, result):
res = result._result
try:
module = res['invocation']['module_name']
except KeyError:
module = None
module = result._task.action
if module == 'setup':
host = result._host.get_name()
self.send_facts(host, res)

2
lib/ansible/plugins/callback/mail.py
View file

@ -87,7 +87,7 @@ class CallbackModule(CallbackBase):
sender = '"Ansible: %s" <root>' % host
attach = res._task.action
if 'invocation' in res._result:
attach = "%s: %s" % (res._result['invocation']['module_name'], json.dumps(res._result['invocation']['module_args']))
attach = "%s: %s" % (res._task.action, json.dumps(res._result['invocation']['module_args']))
subject = 'Failed: %s' % attach
body = 'The following task failed for host ' + host + ':\n\n%s\n\n' % attach