Merge "Make nova-network use FixedIP for timeouts"

2014-02-14 20:23:17 +00:00 · 2014-02-14 20:23:17 +00:00 · 69219acd7d
commit 69219acd7d
parent 311652325b 9776175fc3
1 changed files with 3 additions and 3 deletions
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@ -358,9 +358,9 @@ class NetworkManager(manager.Manager):
            now = timeutils.utcnow()
            timeout = CONF.fixed_ip_disassociate_timeout
            time = now - datetime.timedelta(seconds=timeout)
-            num = self.db.fixed_ip_disassociate_all_by_timeout(context,
-                                                               self.host,
-                                                               time)
+            num = fixed_ip_obj.FixedIP.disassociate_all_by_timeout(context,
+                                                                   self.host,
+                                                                   time)
            if num:
                LOG.debug(_('Disassociated %s stale fixed ip(s)'), num)