summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-12 12:23:18 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-11-12 12:23:18 -0500
commit1d3e6f7053c2e8536365d0be00ebf27324ee87f2 (patch)
tree6c41966bbc04a95456310040718c8c42804a2195 /roles
parent597ba24415d6b7faa7ca02d200c8aed3c08b925a (diff)
parent15c70ef6da8f63ad9c29ee67328795a2232e6371 (diff)
downloadopenshift-1d3e6f7053c2e8536365d0be00ebf27324ee87f2.tar.gz
openshift-1d3e6f7053c2e8536365d0be00ebf27324ee87f2.tar.bz2
openshift-1d3e6f7053c2e8536365d0be00ebf27324ee87f2.tar.xz
openshift-1d3e6f7053c2e8536365d0be00ebf27324ee87f2.zip
Merge pull request #882 from kwoodson/itservice
Fixed a bug. Upon creation also add dependencies to slas.
Diffstat (limited to 'roles')
-rw-r--r--roles/lib_zabbix/library/zbx_itservice.py3
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'):