wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes the bug where it was using only the keys to determine whether a change was made, i.e. values changes for existing keys was reported incorrectly.

Browse source
This commit is contained in:
Jhonny Everson 2015-06-09 09:44:34 -03:00 committed by Matt Clay
parent 7a10716ceb
commit 78e256f5c1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/extras/monitoring/datadog_monitor.py
View file

@ -194,6 +194,10 @@ def _post_monitor(module, options):
except Exception, e: except Exception, e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
def _equal_dicts(a, b, ignore_keys):
ka = set(a).difference(ignore_keys)
kb = set(b).difference(ignore_keys)
return ka == kb and all(a[k] == b[k] for k in ka)
def _update_monitor(module, monitor, options): def _update_monitor(module, monitor, options):
try: try:
@ -202,7 +206,7 @@ def _update_monitor(module, monitor, options):
options=options) options=options)
if 'errors' in msg: if 'errors' in msg:
module.fail_json(msg=str(msg['errors'])) module.fail_json(msg=str(msg['errors']))
elif len(set(msg) - set(monitor)) == 0: elif _equal_dicts(msg, monitor, ['creator', 'overall_state']):
module.exit_json(changed=False, msg=msg) module.exit_json(changed=False, msg=msg)
else: else:
module.exit_json(changed=True, msg=msg) module.exit_json(changed=True, msg=msg)