summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2012-07-30 20:16:26 -0400
committerRussell Bryant <rbryant@redhat.com>2012-07-30 20:18:39 -0400
commite4dd27188e071778c0675b6e8e4d050fb13004f3 (patch)
treed83dc00c212a428805f72018552f4b8c34c35182
parent773d1d61a72700ad5170c259d599891f1dd0a609 (diff)
Fix arg to get_instance_volume_block_device_info().
Michael Still caught this bug while reviewing an earlier patch in this patch series. This code was passing an instance ID to this function, but it expects an instance UUID. Not really related to, but tied up in the patch series for blueprint no-db-messaging. Change-Id: I3ec871deadd13a8117f16ad46c31b0a9c8a016db
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 65bd43f21..78d69becc 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2432,7 +2432,7 @@ class ComputeManager(manager.SchedulerDependentManager):
# NOTE(vish): The mapping is passed in so the driver can disconnect
# from remote volumes if necessary
block_device_info = self._get_instance_volume_block_device_info(
- context, instance['id'])
+ context, instance['uuid'])
self.driver.destroy(instance, self._legacy_nw_info(network_info),
block_device_info)