From 9718f5216ce9423c002c47f86e05b2b2eb08e551 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 27 Jul 2010 14:16:49 -0700
Subject: properly delete old vlans assigned to deleted projects

---
 nova/compute/network.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nova/compute/network.py b/nova/compute/network.py
index b5b3c3b5d..62d892e58 100644
--- a/nova/compute/network.py
+++ b/nova/compute/network.py
@@ -144,7 +144,7 @@ class Vlan(datastore.BasicModel):
     @datastore.absorb_connection_error
     def destroy(self):
         set_name = self._redis_set_name(self.__class__.__name__)
-        datastore.Redis.instance().hdel(set_name, self.project)
+        datastore.Redis.instance().hdel(set_name, self.project_id)
 
     def subnet(self):
         vlan = int(self.vlan_id)
@@ -529,6 +529,7 @@ def get_vlan_for_project(project_id):
                 #             don't orphan any VLANs.  It is basically
                 #             garbage collection for after projects abandoned
                 #             their reference.
+                vlan.destroy()
                 vlan.project_id = project_id
                 vlan.save()
                 return vlan
-- 
cgit