Merge pull request #13648 from bcoca/fix_invocation_and_moderrors

better module error handling
This commit is contained in:
Brian Coca 2015-12-23 10:42:40 -05:00
commit 9a118ce213
3 changed files with 9 additions and 5 deletions

View file

@ -1531,7 +1531,7 @@ class AnsibleModule(object):
if not 'changed' in kwargs:
kwargs['changed'] = False
if 'invocation' not in kwargs:
kwargs['invocation'] = self.params
kwargs['invocation'] = {'module_args': self.params}
kwargs = remove_values(kwargs, self.no_log_values)
self.do_cleanup_files()
print(self.jsonify(kwargs))
@ -1543,7 +1543,7 @@ class AnsibleModule(object):
assert 'msg' in kwargs, "implementation error -- msg to explain the error is required"
kwargs['failed'] = True
if 'invocation' not in kwargs:
kwargs['invocation'] = self.params
kwargs['invocation'] = {'module_args': self.params}
kwargs = remove_values(kwargs, self.no_log_values)
self.do_cleanup_files()
print(self.jsonify(kwargs))