Move manager options into nova.service

Move the compute_manager, console_manager, cert_manager, network_manager
and scheduler_manager options into nova.service.

Apart from the tests, these options are mostly just used in nova.service
so it makes sense for them to live there. Also, metadata_manager already
lives there.

blueprint: scope-config-opts
Change-Id: I180859817b57c081b83d6a6f075a6ff76bb0ef6d

10 files changed, 24 insertions, 25 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 83c5b9c8c..5627687fc 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -175,7 +175,7 @@ CONF.import_opt('allow_resize_to_same_host', 'nova.compute.api')
 CONF.import_opt('console_topic', 'nova.console.rpcapi')
 CONF.import_opt('host', 'nova.config')
 CONF.import_opt('my_ip', 'nova.config')
-CONF.import_opt('network_manager', 'nova.config')
+CONF.import_opt('network_manager', 'nova.service')
 CONF.import_opt('reclaim_instance_interval', 'nova.config')
 CONF.import_opt('vpn_image_id', 'nova.config')
 CONF.import_opt('my_ip', 'nova.config')
diff --git a/nova/config.py b/nova/config.py
index 47e8b2486..bee416cd3 100644
--- a/nova/config.py
+++ b/nova/config.py
@@ -64,21 +64,6 @@ global_opts = [
     cfg.StrOpt('vpn_key_suffix',
                default='-vpn',
                help='Suffix to add to project name for vpn key and secgroups'),
-    cfg.StrOpt('compute_manager',
-               default='nova.compute.manager.ComputeManager',
-               help='full class name for the Manager for compute'),
-    cfg.StrOpt('console_manager',
-               default='nova.console.manager.ConsoleProxyManager',
-               help='full class name for the Manager for console proxy'),
-    cfg.StrOpt('cert_manager',
-               default='nova.cert.manager.CertManager',
-               help='full class name for the Manager for cert'),
-    cfg.StrOpt('network_manager',
-               default='nova.network.manager.VlanManager',
-               help='full class name for the Manager for network'),
-    cfg.StrOpt('scheduler_manager',
-               default='nova.scheduler.manager.SchedulerManager',
-               help='full class name for the Manager for scheduler'),
     cfg.StrOpt('host',
                default=socket.getfqdn(),
                help='Name of this node.  This can be an opaque identifier.  '
diff --git a/nova/service.py b/nova/service.py
index 43619fd56..51004982a 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -87,6 +87,21 @@ service_opts = [
     cfg.IntOpt('metadata_workers',
                default=None,
                help='Number of workers for metadata service'),
+    cfg.StrOpt('compute_manager',
+               default='nova.compute.manager.ComputeManager',
+               help='full class name for the Manager for compute'),
+    cfg.StrOpt('console_manager',
+               default='nova.console.manager.ConsoleProxyManager',
+               help='full class name for the Manager for console proxy'),
+    cfg.StrOpt('cert_manager',
+               default='nova.cert.manager.CertManager',
+               help='full class name for the Manager for cert'),
+    cfg.StrOpt('network_manager',
+               default='nova.network.manager.VlanManager',
+               help='full class name for the Manager for network'),
+    cfg.StrOpt('scheduler_manager',
+               default='nova.scheduler.manager.SchedulerManager',
+               help='full class name for the Manager for scheduler'),
     ]
 
 CONF = cfg.CONF
@@ -482,7 +497,6 @@ class Service(object):
         if not manager:
             manager_cls = ('%s_manager' %
                            binary.rpartition('nova-')[2])
-            CONF.import_opt(manager_cls, 'nova.config')
             manager = CONF.get(manager_cls, None)
         if report_interval is None:
             report_interval = CONF.report_interval
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index aa55891f1..4337fdba9 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -70,7 +70,7 @@ from nova.volume import cinder
 QUOTAS = quota.QUOTAS
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
-CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('host', 'nova.config')
 CONF.import_opt('live_migration_retry_count', 'nova.compute.manager')
 
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index 23374994f..bc2413a2c 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -37,7 +37,7 @@ import nova.tests.image.fake
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
-CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('compute_driver', 'nova.virt.driver')
 
 
diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/compute/test_multiple_nodes.py
index f24f18ac6..afce7ae90 100644
--- a/nova/tests/compute/test_multiple_nodes.py
+++ b/nova/tests/compute/test_multiple_nodes.py
@@ -25,7 +25,7 @@ from nova.virt import fake
 
 
 CONF = cfg.CONF
-CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('compute_driver', 'nova.virt.driver')
 
 
diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py
index 4a1dc8fe6..5e2eaf5a0 100644
--- a/nova/tests/console/test_console.py
+++ b/nova/tests/console/test_console.py
@@ -29,7 +29,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
-CONF.import_opt('console_manager', 'nova.config')
+CONF.import_opt('console_manager', 'nova.service')
 CONF.import_opt('console_driver', 'nova.console.manager')
 
 
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index f6c4f141f..618a6bd54 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -37,7 +37,7 @@ from nova.virt.libvirt import imagecache
 from nova.virt.libvirt import utils as virtutils
 
 CONF = cfg.CONF
-CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('host', 'nova.config')
 
 LOG = log.getLogger(__name__)
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index c716ae77e..ab3f87add 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -72,7 +72,7 @@ libvirt_driver.libvirt = libvirt
 
 
 CONF = cfg.CONF
-CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('host', 'nova.config')
 CONF.import_opt('my_ip', 'nova.config')
 CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 2e2011a74..bb927d1d5 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -57,10 +57,10 @@ from nova.virt.xenapi import volume_utils
 LOG = logging.getLogger(__name__)
 
 CONF = cfg.CONF
-CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_manager', 'nova.service')
+CONF.import_opt('network_manager', 'nova.service')
 CONF.import_opt('compute_driver', 'nova.virt.driver')
 CONF.import_opt('host', 'nova.config')
-CONF.import_opt('network_manager', 'nova.config')
 CONF.import_opt('default_availability_zone', 'nova.availability_zones')
 
 IMAGE_MACHINE = '1'