summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-06-21 11:51:08 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-06-21 11:51:08 -0500
commit35665d9d6a17c7e753dcd3ec5bf6bc68af1fbf0e (patch)
tree7eedc67bfee7f3d7b58236c071f9fb0b9e753e01
parent796d3b67dcdb2670714abf9e02b278bd6898358b (diff)
added try except around floating ip get by host in host init
-rw-r--r--nova/network/manager.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 1a5afb454..52fe4251a 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -158,8 +158,12 @@ class FloatingIP(object):
"""Configures floating ips owned by host."""
admin_context = context.get_admin_context()
- floating_ips = self.db.floating_ip_get_all_by_host(admin_context,
- self.host)
+ try:
+ floating_ips = self.db.floating_ip_get_all_by_host(admin_context,
+ self.host)
+ except exception.NotFound:
+ return
+
for floating_ip in floating_ips:
if floating_ip.get('fixed_ip', None):
fixed_address = floating_ip['fixed_ip']['address']