summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-15 21:04:46 +0000
committerGerrit Code Review <review@openstack.org>2013-01-15 21:04:46 +0000
commit8d275c735afedca2884196dc6a554165dda84547 (patch)
tree8d5c0015aba0955906db2e9dc979e12fadffb726 /nova
parent479f962063c0ed2b3722c31b6630a4df445b4956 (diff)
parent41e0b409d0aa7f7fd9db6f99bfa7e409206986f5 (diff)
Merge "Make resource tracker use conductor for migration updates"
Diffstat (limited to 'nova')
-rw-r--r--nova/compute/resource_tracker.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py
index d2afcaa27..f3c3ae7a3 100644
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@@ -354,8 +354,7 @@ class ResourceTracker(object):
def confirm_resize(self, context, migration, status='confirmed'):
"""Cleanup usage for a confirmed resize."""
elevated = context.elevated()
- db.migration_update(elevated, migration['id'],
- {'status': status})
+ self.conductor_api.migration_update(elevated, migration, status)
self.update_available_resource(elevated)
def revert_resize(self, context, migration, status='reverted'):