From f15892f229f3909dc1e3d5baa1cc5f95e172cc93 Mon Sep 17 00:00:00 2001
From: John Tran <jhtran@att.com>
Date: Fri, 2 Nov 2012 16:44:42 +0000
Subject: [PATCH] pollster trap error due to zero floating ip

fixes bug #1056087 when nova doesn't have any
floating ip addresses defined causes a db
exception instead of raising it should be
trapped

Change-Id: Iea441fb8bcd720339b2446525a6202941c33a1ec
---
 ceilometer/network/floatingip.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py
index 77f2df962..933806778 100644
--- a/ceilometer/network/floatingip.py
+++ b/ceilometer/network/floatingip.py
@@ -32,6 +32,8 @@ class FloatingIPPollster(plugin.CentralPollster):
     def get_counters(self, manager, context):
         try:
             ips = manager.resources.floating_ip_get_all(context)
+        except exception.NoFloatingIpsDefined:
+            pass
         except exception.FloatingIpNotFoundForHost:
             pass
         else: