diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-11-16 17:07:42 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-11-16 17:07:42 -0500 |
| commit | ad5b5e762b2899fd97520da8c814bcb2a60b5ced (patch) | |
| tree | 5a08fca88e33f198b88260c9f12aaae11ef4cb3f /roles/lib_zabbix/library | |
| parent | 5ed42612965d72b87638ebe2fa96bec89199c4fa (diff) | |
| parent | 56bfd1e0cd39c0cc5b3bd52113e634f3588eb14f (diff) | |
| download | openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.tar.gz openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.tar.bz2 openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.tar.xz openshift-ad5b5e762b2899fd97520da8c814bcb2a60b5ced.zip | |
Merge pull request #912 from twiest/master
sync master -> prod branch
Diffstat (limited to 'roles/lib_zabbix/library')
| -rw-r--r-- | roles/lib_zabbix/library/zbx_itservice.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/lib_zabbix/library/zbx_itservice.py b/roles/lib_zabbix/library/zbx_itservice.py index 37aea1494..a5ee97e15 100644 --- a/roles/lib_zabbix/library/zbx_itservice.py +++ b/roles/lib_zabbix/library/zbx_itservice.py @@ -183,7 +183,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]['serviceid']]) module.exit_json(changed=True, results=content['result'], state="absent") # Create and Update @@ -210,6 +210,7 @@ def main(): if content.has_key('error'): module.exit_json(failed=True, changed=True, results=content['error'], state="present") + if dependencies: content = add_dependencies(zapi, module.params['name'], dependencies) if content.has_key('error'): |