summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Elliott <brian.elliott@rackspace.com>2012-11-30 21:06:55 +0000
committerBrian Elliott <brian.elliott@rackspace.com>2012-12-01 09:17:18 +0000
commit64aa5b2733dd3c200fcffe2add7fb76a7e2adf7f (patch)
tree7def1a1ac0393571d4117fd9740180055f6ab1b8
parent29cac1f08cec5eb1ed00cb0b62ec9b75a78038be (diff)
downloadnova-64aa5b2733dd3c200fcffe2add7fb76a7e2adf7f.tar.gz
nova-64aa5b2733dd3c200fcffe2add7fb76a7e2adf7f.tar.xz
nova-64aa5b2733dd3c200fcffe2add7fb76a7e2adf7f.zip
On confirm_resize, update correct resource tracker
On confirm_resize, update the resource tracker based on the source node of the instance, not the destination. bug 1085325 Change-Id: I041fc27225a8ed8e61fe21945d9241377b1d6384
-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 4baeab255..de3d3ddd4 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1625,7 +1625,7 @@ class ComputeManager(manager.SchedulerDependentManager):
self.driver.confirm_migration(migration, instance,
self._legacy_nw_info(network_info))
- rt = self._get_resource_tracker(instance.get('node'))
+ rt = self._get_resource_tracker(migration['source_node'])
rt.confirm_resize(context, migration)
self._notify_about_instance_usage(