diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-27 14:16:49 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-27 14:16:49 -0700 |
| commit | 9718f5216ce9423c002c47f86e05b2b2eb08e551 (patch) | |
| tree | 47151f0d49c306dea92690ba3be14d385af166c1 | |
| parent | a5f4a865b537d95acf5f02458824f95d30aac261 (diff) | |
properly delete old vlans assigned to deleted projects
| -rw-r--r-- | nova/compute/network.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |