From 39ce4032bb62bf62e84b9a4191e16a28e4a68454 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 8 Jan 2013 07:20:09 +0000 Subject: [PATCH] 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 --- bin/nova-dhcpbridge | 2 +- bin/nova-manage | 2 +- nova/compute/manager.py | 2 +- nova/config.py | 15 --------------- nova/service.py | 16 +++++++++++++++- nova/tests/compute/test_compute.py | 2 +- nova/tests/compute/test_compute_utils.py | 2 +- nova/tests/compute/test_multiple_nodes.py | 2 +- nova/tests/console/test_console.py | 2 +- nova/tests/test_imagecache.py | 2 +- nova/tests/test_libvirt.py | 2 +- nova/tests/test_xenapi.py | 4 ++-- 12 files changed, 26 insertions(+), 27 deletions(-) diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 66f6ba6a33b5..582edde99a4c 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -48,7 +48,7 @@ from nova import utils CONF = cfg.CONF CONF.import_opt('host', 'nova.config') -CONF.import_opt('network_manager', 'nova.config') +CONF.import_opt('network_manager', 'nova.service') LOG = logging.getLogger('nova.dhcpbridge') diff --git a/bin/nova-manage b/bin/nova-manage index ba484a04ea2e..3eb3b689c571 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -90,7 +90,7 @@ from nova import utils from nova import version CONF = cfg.CONF -CONF.import_opt('network_manager', 'nova.config') +CONF.import_opt('network_manager', 'nova.service') CONF.import_opt('service_down_time', 'nova.config') CONF.import_opt('flat_network_bridge', 'nova.network.manager') CONF.import_opt('num_networks', 'nova.network.manager') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 83c5b9c8c3d7..5627687fcb03 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 47e8b2486cc7..bee416cd36a3 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 43619fd56c51..51004982a1f1 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 aa55891f178a..4337fdba9c30 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 23374994fb84..bc2413a2c1bc 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 f24f18ac6786..afce7ae90834 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 4a1dc8fe6c65..5e2eaf5a085f 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 f6c4f141f6dc..618a6bd540b3 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 c716ae77ebc9..ab3f87adddbe 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 2e2011a74793..bb927d1d599e 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'