diff options
Diffstat (limited to 'nova/consoleauth')
| -rw-r--r-- | nova/consoleauth/__init__.py | 5 | ||||
| -rw-r--r-- | nova/consoleauth/manager.py | 11 | ||||
| -rw-r--r-- | nova/consoleauth/rpcapi.py | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/nova/consoleauth/__init__.py b/nova/consoleauth/__init__.py index 85cbac622..11253ea91 100644 --- a/nova/consoleauth/__init__.py +++ b/nova/consoleauth/__init__.py @@ -18,6 +18,7 @@ """Module to authenticate Consoles.""" +from nova import config from nova import flags from nova.openstack.common import cfg @@ -26,5 +27,5 @@ consoleauth_topic_opt = cfg.StrOpt('consoleauth_topic', default='consoleauth', help='the topic console auth proxy nodes listen on') -FLAGS = flags.FLAGS -FLAGS.register_opt(consoleauth_topic_opt) +CONF = config.CONF +CONF.register_opt(consoleauth_topic_opt) diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index c78554c87..c772101eb 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -20,6 +20,7 @@ import time +from nova import config from nova import flags from nova import manager from nova.openstack.common import cfg @@ -38,8 +39,8 @@ consoleauth_opts = [ help='Manager for console auth'), ] -FLAGS = flags.FLAGS -FLAGS.register_opts(consoleauth_opts) +CONF = config.CONF +CONF.register_opts(consoleauth_opts) class ConsoleAuthManager(manager.Manager): @@ -50,11 +51,11 @@ class ConsoleAuthManager(manager.Manager): def __init__(self, scheduler_driver=None, *args, **kwargs): super(ConsoleAuthManager, self).__init__(*args, **kwargs) - if FLAGS.memcached_servers: + if CONF.memcached_servers: import memcache else: from nova.common import memorycache as memcache - self.mc = memcache.Client(FLAGS.memcached_servers, + self.mc = memcache.Client(CONF.memcached_servers, debug=0) def authorize_console(self, context, token, console_type, host, port, @@ -66,7 +67,7 @@ class ConsoleAuthManager(manager.Manager): 'internal_access_path': internal_access_path, 'last_activity_at': time.time()} data = jsonutils.dumps(token_dict) - self.mc.set(token, data, FLAGS.console_token_ttl) + self.mc.set(token, data, CONF.console_token_ttl) LOG.audit(_("Received Token: %(token)s, %(token_dict)s)"), locals()) def check_token(self, context, token): diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py index 2fafe3fd0..51d28cb04 100644 --- a/nova/consoleauth/rpcapi.py +++ b/nova/consoleauth/rpcapi.py @@ -18,11 +18,11 @@ Client side of the consoleauth RPC API. """ +from nova import config from nova import flags import nova.openstack.common.rpc.proxy - -FLAGS = flags.FLAGS +CONF = config.CONF class ConsoleAuthAPI(nova.openstack.common.rpc.proxy.RpcProxy): @@ -45,7 +45,7 @@ class ConsoleAuthAPI(nova.openstack.common.rpc.proxy.RpcProxy): def __init__(self): super(ConsoleAuthAPI, self).__init__( - topic=FLAGS.consoleauth_topic, + topic=CONF.consoleauth_topic, default_version=self.BASE_RPC_API_VERSION) def authorize_console(self, ctxt, token, console_type, host, port, |