summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-08-25 12:50:36 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-08-25 12:50:36 -0400
commit6758779249d490fd21bfdeae6d40adfc33d8cd17 (patch)
tree968009fd767e1dce993c2f516c7031bf3e518253 /nova/compute
parenta14e2b1d8cbc87d5bcb31b9127035160fde4acc5 (diff)
Reverted two mistakes when looking over full diff.
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 5427b896e..a3ced1279 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -547,8 +547,6 @@ class ComputeManager(manager.SchedulerDependentManager):
vm_state=vm_states.REBUILDING,
task_state=task_states.BLOCK_DEVICE_MAPPING)
- bd_mapping = self._setup_block_device_mapping(context, instance_id)
-
image_ref = kwargs.get('image_ref')
instance_ref.image_ref = image_ref
instance_ref.injected_files = kwargs.get('injected_files', [])