summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-21 08:30:53 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-21 08:30:53 -0700
commit5960041b73724734de548dd279595b793e02f809 (patch)
tree273a656c4bbc129615c5315a38aeba3f90a8a644 /nova/compute
parent10be00e16c6428bf3709590f13984246fdfaf14b (diff)
parentce0a9b7b36ba816c347f10a1804aedf337ad35da (diff)
merged trunk
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 2a576e49f..1ed70dc3f 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -185,7 +185,7 @@ class ComputeManager(manager.Manager):
volume_id)
instance_ref = self.db.instance_get(context, instance_id)
volume_ref = self.db.volume_get(context, volume_id)
- self.driver.detach_volume(instance_ref['str_id'],
- volume_ref['mountpoint'])
+ yield self.driver.detach_volume(instance_ref['str_id'],
+ volume_ref['mountpoint'])
self.db.volume_detached(context, volume_id)
defer.returnValue(True)