From d8c1a74342af9af442e4ef0508fa1f66eac48bb5 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 9 Aug 2010 23:02:06 -0700
Subject: fix releasing to work properly

---
 nova/network/model.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nova/network/model.py b/nova/network/model.py
index a70671632..109ae64c7 100644
--- a/nova/network/model.py
+++ b/nova/network/model.py
@@ -243,12 +243,12 @@ class BaseNetwork(datastore.BasicModel):
     def release_ip(self, ip_str):
         if not ip_str in self.assigned:
             raise exception.AddressNotAllocated()
-        self.deexpress(address=ip_str)
         self._rem_host(ip_str)
+        self.deexpress(address=ip_str)
 
     def deallocate_ip(self, ip_str):
-        # Do nothing for now, cleanup on ip release
-        pass
+       # go ahead and remove ip
+        self.release_ip(ip_str)
 
     def list_addresses(self):
         for address in self.hosts:
-- 
cgit