Merge pull request #2234 from lalinsky/zabbix-host-proxy

monitoring/zabbix_host: Fix (no) proxy handling
8 years ago · 05d9a41ca5
parent 8c1b672929 3a90f78cca
commit 05d9a41ca5
1 changed files with 3 additions and 2 deletions
--- a/monitoring/zabbix_host.py
+++ b/monitoring/zabbix_host.py
@ -362,8 +362,9 @@ class Host(object):
        if set(list(template_ids)) != set(exist_template_ids):
            return True

-        if host['proxy_hostid'] != proxy_id:
-            return True
+        if proxy_id is not None:
+            if host['proxy_hostid'] != proxy_id:
+                return True

        return False