summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-08-12 14:57:47 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-08-12 14:57:47 -0400
commit2244cbd8f0c1acf0a0f3666781ff8d44c8338a73 (patch)
treef6ae69114c3099ef3dde4b3da9a759e052a02b6d /roles
parentf6f21d3a639323045fb98b59babeaca8ceb54c65 (diff)
parent75170e2f6558dc9df9bfdb93dbf2bf9b13c1bce5 (diff)
downloadopenshift-2244cbd8f0c1acf0a0f3666781ff8d44c8338a73.tar.gz
openshift-2244cbd8f0c1acf0a0f3666781ff8d44c8338a73.tar.bz2
openshift-2244cbd8f0c1acf0a0f3666781ff8d44c8338a73.tar.xz
openshift-2244cbd8f0c1acf0a0f3666781ff8d44c8338a73.zip
Merge pull request #454 from kwoodson/cleanup
zbx_item fix and removed files
Diffstat (limited to 'roles')
-rw-r--r--roles/os_zabbix/library/zbx_item.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/os_zabbix/library/zbx_item.py b/roles/os_zabbix/library/zbx_item.py
index 6cfb16d48..57ec06463 100644
--- a/roles/os_zabbix/library/zbx_item.py
+++ b/roles/os_zabbix/library/zbx_item.py
@@ -119,7 +119,7 @@ def main():
module.exit_json(changed=True, results=content['result'], state="absent")
if state == 'present':
- params = {'name': module.params['name'],
+ params = {'name': module.params.get('name', module.params['key']),
'key_': key,
'hostid': templateid,
'type': module.params['zabbix_type'],