summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Diaz <jdiaz@redhat.com>2015-12-08 12:06:33 -0500
committerJoel Diaz <jdiaz@redhat.com>2015-12-08 12:06:33 -0500
commit82046d66d2b81782e1768f9f3f7f1099bffd8907 (patch)
tree66e2b01e022427f69c31e7e379eb1ec9e3eaf503
parent7c66f50271586c2cd9f67e925d38c8c7629a56a6 (diff)
parent92c1e7f9a6c3d0ec0dccd170f80b2411447e0b2e (diff)
downloadopenshift-82046d66d2b81782e1768f9f3f7f1099bffd8907.tar.gz
openshift-82046d66d2b81782e1768f9f3f7f1099bffd8907.tar.bz2
openshift-82046d66d2b81782e1768f9f3f7f1099bffd8907.tar.xz
openshift-82046d66d2b81782e1768f9f3f7f1099bffd8907.zip
Merge pull request #1036 from joelddiaz/zbx-action
Fix absent state
-rw-r--r--roles/lib_zabbix/library/zbx_action.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_zabbix/library/zbx_action.py b/roles/lib_zabbix/library/zbx_action.py
index 24693e5db..8bb586c0b 100644
--- a/roles/lib_zabbix/library/zbx_action.py
+++ b/roles/lib_zabbix/library/zbx_action.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
+# vim: expandtab:tabstop=4:shiftwidth=4
'''
Ansible module for zabbix actions
'''
-# vim: expandtab:tabstop=4:shiftwidth=4
#
# Zabbix action ansible module
#
@@ -457,7 +457,7 @@ def main():
if not exists(content):
module.exit_json(changed=False, state="absent")
- content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['itemid']])
+ content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['actionid']])
module.exit_json(changed=True, results=content['result'], state="absent")
# Create and Update