summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-08 18:06:43 +0000
committerGerrit Code Review <review@openstack.org>2012-05-08 18:06:43 +0000
commit314cc19dcac67af59beeac9901c8f03416113685 (patch)
tree4c31fd8091de09c4f8dcef0661f1c8a13b303657 /nova/compute
parent9019705f70a77293bcc6f4394a274fa15115b0f5 (diff)
parent44651806269f449f81d873353d3291dd72e6360a (diff)
Merge "Remove state altering in live-migration code"
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index dca66dd96..aa94448d8 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2065,10 +2065,6 @@ class ComputeManager(manager.SchedulerDependentManager):
"args": {'instance_id': instance_ref['id'],
'block_migration': block_migration}})
- # Restore volume state
- for volume_ref in instance_ref['volumes']:
- self.volume_api.update(ctxt, volume_ref, {'status': 'in-use'})
-
# No instance booting at source host, but instance dir
# must be deleted for preparing next block migration
if block_migration: