Move consoleauth_manager option into nova.service and fix imports

Moves the consoleauth_manager option into nova.service like the other
manager options in commit 39ce4032.

The thinking for having it in nova.service is that's where
CONF.get('%_manager'...) is called.  It also makes no sense for the
option to be declared in nova.consoleauth.manager because if you change
this config option, then you don't want nova.consoleauth.manager loaded.

Closes-Bug: #1276398

Change-Id: I85e089239228920e9e58284cf6ff52e43bf85ab0

etc/nova/nova.conf.sample

@@ -433,6 +433,9 @@
 # value)
 #console_manager=nova.console.manager.ConsoleProxyManager
 
+# Manager for console auth (string value)
+#consoleauth_manager=nova.consoleauth.manager.ConsoleAuthManager
+
 # Full class name for the Manager for cert (string value)
 #cert_manager=nova.cert.manager.CertManager
 
@@ -1075,9 +1078,6 @@
 # How many seconds before deleting tokens (integer value)
 #console_token_ttl=600
 
-# Manager for console auth (string value)
-#consoleauth_manager=nova.consoleauth.manager.ConsoleAuthManager
-
 
 #
 # Options defined in nova.db.api

nova/cmd/consoleauth.py

@@ -24,7 +24,6 @@ from nova.openstack.common import log as logging
 from nova import service
 
 CONF = cfg.CONF
-CONF.import_opt('consoleauth_manager', 'nova.consoleauth.manager')
 
 
 def main():

nova/consoleauth/manager.py

@@ -36,10 +36,7 @@ LOG = logging.getLogger(__name__)
 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'),
+               help='How many seconds before deleting tokens')
     ]
 
 CONF = cfg.CONF

nova/service.py

@@ -95,6 +95,9 @@ service_opts = [
     cfg.StrOpt('console_manager',
                default='nova.console.manager.ConsoleProxyManager',
                help='Full class name for the Manager for console proxy'),
+    cfg.StrOpt('consoleauth_manager',
+               default='nova.consoleauth.manager.ConsoleAuthManager',
+               help='Manager for console auth'),
     cfg.StrOpt('cert_manager',
                default='nova.cert.manager.CertManager',
                help='Full class name for the Manager for cert'),