summaryrefslogtreecommitdiff
path: root/lib/ansible/modules/monitoring
diff options
context:
space:
mode:
authorRuben Tsirunyan <rubentsirunyan@gmail.com>2018-12-26 10:59:45 +0400
committeransibot <ansibot@users.noreply.github.com>2018-12-26 01:59:45 -0500
commit09ba1f38f16d78f8c0e2ffbb7e08858d76c184d4 (patch)
tree520c84a65ae65f08765469149d83a626beccad99 /lib/ansible/modules/monitoring
parent3517373cfda6b68f5237d454631ec6bbbd2870a5 (diff)
downloadansible-09ba1f38f16d78f8c0e2ffbb7e08858d76c184d4.tar.gz
Zabbix Action: Idempotency fix (#50297)
Diffstat (limited to 'lib/ansible/modules/monitoring')
-rw-r--r--lib/ansible/modules/monitoring/zabbix/zabbix_action.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/ansible/modules/monitoring/zabbix/zabbix_action.py b/lib/ansible/modules/monitoring/zabbix/zabbix_action.py
index 7933505434..4b26552a22 100644
--- a/lib/ansible/modules/monitoring/zabbix/zabbix_action.py
+++ b/lib/ansible/modules/monitoring/zabbix/zabbix_action.py
@@ -766,12 +766,6 @@ class Action(object):
parameters = convert_unicode_to_str(self._construct_parameters(**kwargs))
change_parameters = {}
_diff = cleanup_data(compare_dictionaries(parameters, existing_action, change_parameters))
- if ('recovery_operations' in cleanup_data(existing_action) and
- 'acknowledge_operations' not in cleanup_data(parameters)):
- _diff['recovery_operations'] = []
- if ('acknowledge_operations' in cleanup_data(existing_action) and
- 'acknowledge_operations' not in cleanup_data(parameters)):
- _diff['acknowledge_operations'] = []
return _diff
def update_action(self, **kwargs):
@@ -1564,8 +1558,8 @@ def main():
conditions=dict(type='list', required=False, default=None),
formula=dict(type='str', required=False, default=None),
operations=dict(type='list', required=False, default=None),
- recovery_operations=dict(type='list', required=False, default=None),
- acknowledge_operations=dict(type='list', required=False, default=None)
+ recovery_operations=dict(type='list', required=False, default=[]),
+ acknowledge_operations=dict(type='list', required=False, default=[])
),
supports_check_mode=True
)