diff options
Diffstat (limited to 'nova/consoleauth')
| -rw-r--r-- | nova/consoleauth/__init__.py | 9 | ||||
| -rw-r--r-- | nova/consoleauth/manager.py | 17 |
2 files changed, 19 insertions, 7 deletions
diff --git a/nova/consoleauth/__init__.py b/nova/consoleauth/__init__.py index 9d578b77a..4048ae433 100644 --- a/nova/consoleauth/__init__.py +++ b/nova/consoleauth/__init__.py @@ -18,9 +18,14 @@ """Module to authenticate Consoles.""" +from nova.common import cfg from nova import flags +consoleauth_topic_opt = \ + cfg.StrOpt('consoleauth_topic', + default='consoleauth', + help='the topic console auth proxy nodes listen on') + FLAGS = flags.FLAGS -flags.DEFINE_string('consoleauth_topic', 'consoleauth', - 'the topic console auth proxy nodes listen on') +FLAGS.add_option(consoleauth_topic_opt) diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index 8f86b4b8c..08ddd5a3b 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -22,6 +22,7 @@ import os import sys import time +from nova.common import cfg from nova import flags from nova import log as logging from nova import manager @@ -29,12 +30,18 @@ from nova import utils LOG = logging.getLogger('nova.consoleauth') + +consoleauth_opts = [ + cfg.IntOpt('console_token_ttl', + default=600, + help='How many seconds before deleting tokens'), + cfg.StrOpt('consoleauth_manager', + default='nova.consoleauth.manager.ConsoleAuthManager', + help='Manager for console auth'), + ] + FLAGS = flags.FLAGS -flags.DEFINE_integer('console_token_ttl', 600, - 'How many seconds before deleting tokens') -flags.DEFINE_string('consoleauth_manager', - 'nova.consoleauth.manager.ConsoleAuthManager', - 'Manager for console auth') +FLAGS.add_options(consoleauth_opts) class ConsoleAuthManager(manager.Manager): |