From 2b9dc19865899c6cf7418b4779425a98cfd83389 Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Tue, 10 Jan 2017 11:51:35 +0100 Subject: [PATCH] Fix collectd_openstack.py for None values Change-Id: I6338d0029da09add66c5ebed92ab452bbccac556 Co-Authored-By: Simon Pasquier --- .../lma_collector/files/collectd/collectd_openstack.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_openstack.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_openstack.py index 55393384f..955d780af 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_openstack.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_openstack.py @@ -345,5 +345,9 @@ class CollectdPlugin(base.Base): counts = defaultdict(int) for obj in list_object: s = group_by_func(obj) - counts[s] += count_func(obj) if count_func else 1 + try: + counts[s] += count_func(obj) if count_func else 1 + except TypeError: + # Ignore when count_func() doesn't return a number + pass return counts