summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-10-08 14:38:33 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-10-08 14:38:33 -0400
commit4acfad9d05e16ba1173d45d544bddc89c5eb4ebd (patch)
treef10108bc6c043d86cc70d2c72a423dfc2fcc0b3d /roles
parent2ff94367be1e8239e13fb8b2ab17eac6d931a283 (diff)
parent365f9c5503f1a9f8d685b91eb1175b7029058e3b (diff)
downloadopenshift-4acfad9d05e16ba1173d45d544bddc89c5eb4ebd.tar.gz
openshift-4acfad9d05e16ba1173d45d544bddc89c5eb4ebd.tar.bz2
openshift-4acfad9d05e16ba1173d45d544bddc89c5eb4ebd.tar.xz
openshift-4acfad9d05e16ba1173d45d544bddc89c5eb4ebd.zip
Merge pull request #672 from kwoodson/zbxmediafix
Fixed a bug where we are updating where we should be creating.
Diffstat (limited to 'roles')
-rw-r--r--roles/lib_zabbix/library/zbx_user_media.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/lib_zabbix/library/zbx_user_media.py b/roles/lib_zabbix/library/zbx_user_media.py
index 9ed838f81..8895c78c3 100644
--- a/roles/lib_zabbix/library/zbx_user_media.py
+++ b/roles/lib_zabbix/library/zbx_user_media.py
@@ -260,6 +260,9 @@ def main():
for user in params['users']:
diff['users']['userid'] = user['userid']
+ # Medias have no real unique key so therefore we need to make it like the incoming user's request
+ diff['medias'] = medias
+
# We have differences and need to update
content = zapi.get_content(zbx_class_name, 'updatemedia', diff)