From ec75cc2a6bc6e3f367b3377515cb9c4b99a6ab29 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Fri, 29 Mar 2013 09:19:57 -0700 Subject: Fix automatic confirmation of resizes for no-db-compute compute/api.py:confirm_resize() was still making a bunch of calls against the database that were tripping over the no-db-compute enforcement checks. Instead of trying to unwind all of the instance action, quota, etc code and divert to conductor, just farm out the entire confirm_resize() call to conductor. Fixes bug 1161402 Change-Id: I121040a3b575f5866d45cc8ef6862d67f5558715 --- nova/compute/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6cb0bbb94..f36f74531 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3434,8 +3434,8 @@ class ComputeManager(manager.SchedulerDependentManager): instance=instance) continue try: - self.compute_api.confirm_resize(context, instance, - migration_ref=migration) + self.conductor_api.compute_confirm_resize( + context, instance, migration_ref=migration) except Exception, e: msg = _("Error auto-confirming resize: %(e)s. " "Will retry later.") -- cgit