From 188f306aa88a6a5b73959c74f1642720d7627789 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Fri, 12 Apr 2013 11:25:18 -0700 Subject: Make compute/manager use conductor for unrescue() The compute_api.unrescue() call makes direct database queries, which means it can't be called directly from compute manager. This patch adds support in conductor for proxying this request and makes compute manager utilize it. Fixes bug 1167619 Change-Id: I158c64cabdfe436462f5669047fb930819a13c50 --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index bd326ad2b..fb7b743e1 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3478,7 +3478,7 @@ class ComputeManager(manager.SchedulerDependentManager): to_unrescue.append(instance) for instance in to_unrescue: - self.compute_api.unrescue(context, instance) + self.conductor_api.compute_unrescue(context, instance) @manager.periodic_task def _poll_unconfirmed_resizes(self, context): -- cgit