From 6c6e43e466a5383b3ef3c852c9b2749f0fad64dc Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Fri, 31 May 2013 15:03:25 +1000 Subject: Fix bug where consoleauth depended on remote conductor service Fixes bug 1186123 Conductor API was being imported directly so ignoring use_local FLAG Change-Id: I055a5301d4c18d201d67f114047f503114751603 --- nova/consoleauth/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index a235eafb6..6e822cf18 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -24,7 +24,7 @@ from oslo.config import cfg from nova.cells import rpcapi as cells_rpcapi from nova.compute import rpcapi as compute_rpcapi -from nova.conductor import api as conductor_api +from nova import conductor from nova import manager from nova.openstack.common import jsonutils from nova.openstack.common import log as logging @@ -56,7 +56,7 @@ class ConsoleAuthManager(manager.Manager): super(ConsoleAuthManager, self).__init__(service_name='consoleauth', *args, **kwargs) self.mc = memorycache.get_client() - self.conductor_api = conductor_api.API() + self.conductor_api = conductor.API() self.compute_rpcapi = compute_rpcapi.ComputeAPI() self.cells_rpcapi = cells_rpcapi.CellsAPI() -- cgit