diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-09 23:02:06 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-09 23:02:06 -0700 |
| commit | d8c1a74342af9af442e4ef0508fa1f66eac48bb5 (patch) | |
| tree | 74b08f15141cef7a8c91edb5c8ee02e1957f399b | |
| parent | bd0645153fb1b60a551c50c657a7837713da54a9 (diff) | |
| download | nova-d8c1a74342af9af442e4ef0508fa1f66eac48bb5.tar.gz nova-d8c1a74342af9af442e4ef0508fa1f66eac48bb5.tar.xz nova-d8c1a74342af9af442e4ef0508fa1f66eac48bb5.zip | |
fix releasing to work properly
| -rw-r--r-- | nova/network/model.py | 6 |
1 files 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: |