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
This commit is contained in:
Mark McLoughlin
2013-01-08 07:20:09 +00:00
parent eac6e73223
commit 39ce4032bb
12 changed files with 26 additions and 27 deletions

View File

@@ -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'