diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-05 02:06:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-05 02:06:50 +0000 |
| commit | a1c151f0ff3b75cc3530b0959d09a28ea4ec0b28 (patch) | |
| tree | 843cc4537a56955cec9c0f8d1fcf731e5ec820a3 | |
| parent | ebecd7848336e3db35720bc49ec6604e8af656fb (diff) | |
| parent | 6c6e43e466a5383b3ef3c852c9b2749f0fad64dc (diff) | |
| download | nova-a1c151f0ff3b75cc3530b0959d09a28ea4ec0b28.tar.gz nova-a1c151f0ff3b75cc3530b0959d09a28ea4ec0b28.tar.xz nova-a1c151f0ff3b75cc3530b0959d09a28ea4ec0b28.zip | |
Merge "Fix bug where consoleauth depended on remote conductor service"
| -rw-r--r-- | nova/consoleauth/manager.py | 4 |
1 files 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() |