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:
parent
eac6e73223
commit
39ce4032bb
@ -48,7 +48,7 @@ from nova import utils
|
|||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
CONF.import_opt('host', 'nova.config')
|
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')
|
LOG = logging.getLogger('nova.dhcpbridge')
|
||||||
|
|
||||||
|
|
||||||
|
@ -90,7 +90,7 @@ from nova import utils
|
|||||||
from nova import version
|
from nova import version
|
||||||
|
|
||||||
CONF = cfg.CONF
|
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('service_down_time', 'nova.config')
|
||||||
CONF.import_opt('flat_network_bridge', 'nova.network.manager')
|
CONF.import_opt('flat_network_bridge', 'nova.network.manager')
|
||||||
CONF.import_opt('num_networks', 'nova.network.manager')
|
CONF.import_opt('num_networks', 'nova.network.manager')
|
||||||
|
@ -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('console_topic', 'nova.console.rpcapi')
|
||||||
CONF.import_opt('host', 'nova.config')
|
CONF.import_opt('host', 'nova.config')
|
||||||
CONF.import_opt('my_ip', '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('reclaim_instance_interval', 'nova.config')
|
||||||
CONF.import_opt('vpn_image_id', 'nova.config')
|
CONF.import_opt('vpn_image_id', 'nova.config')
|
||||||
CONF.import_opt('my_ip', 'nova.config')
|
CONF.import_opt('my_ip', 'nova.config')
|
||||||
|
@ -64,21 +64,6 @@ global_opts = [
|
|||||||
cfg.StrOpt('vpn_key_suffix',
|
cfg.StrOpt('vpn_key_suffix',
|
||||||
default='-vpn',
|
default='-vpn',
|
||||||
help='Suffix to add to project name for vpn key and secgroups'),
|
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',
|
cfg.StrOpt('host',
|
||||||
default=socket.getfqdn(),
|
default=socket.getfqdn(),
|
||||||
help='Name of this node. This can be an opaque identifier. '
|
help='Name of this node. This can be an opaque identifier. '
|
||||||
|
@ -87,6 +87,21 @@ service_opts = [
|
|||||||
cfg.IntOpt('metadata_workers',
|
cfg.IntOpt('metadata_workers',
|
||||||
default=None,
|
default=None,
|
||||||
help='Number of workers for metadata service'),
|
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
|
CONF = cfg.CONF
|
||||||
@ -482,7 +497,6 @@ class Service(object):
|
|||||||
if not manager:
|
if not manager:
|
||||||
manager_cls = ('%s_manager' %
|
manager_cls = ('%s_manager' %
|
||||||
binary.rpartition('nova-')[2])
|
binary.rpartition('nova-')[2])
|
||||||
CONF.import_opt(manager_cls, 'nova.config')
|
|
||||||
manager = CONF.get(manager_cls, None)
|
manager = CONF.get(manager_cls, None)
|
||||||
if report_interval is None:
|
if report_interval is None:
|
||||||
report_interval = CONF.report_interval
|
report_interval = CONF.report_interval
|
||||||
|
@ -70,7 +70,7 @@ from nova.volume import cinder
|
|||||||
QUOTAS = quota.QUOTAS
|
QUOTAS = quota.QUOTAS
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
CONF = cfg.CONF
|
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('host', 'nova.config')
|
||||||
CONF.import_opt('live_migration_retry_count', 'nova.compute.manager')
|
CONF.import_opt('live_migration_retry_count', 'nova.compute.manager')
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ import nova.tests.image.fake
|
|||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
CONF = cfg.CONF
|
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')
|
CONF.import_opt('compute_driver', 'nova.virt.driver')
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ from nova.virt import fake
|
|||||||
|
|
||||||
|
|
||||||
CONF = cfg.CONF
|
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')
|
CONF.import_opt('compute_driver', 'nova.virt.driver')
|
||||||
|
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ from nova.openstack.common import rpc
|
|||||||
from nova import test
|
from nova import test
|
||||||
|
|
||||||
CONF = cfg.CONF
|
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')
|
CONF.import_opt('console_driver', 'nova.console.manager')
|
||||||
|
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ from nova.virt.libvirt import imagecache
|
|||||||
from nova.virt.libvirt import utils as virtutils
|
from nova.virt.libvirt import utils as virtutils
|
||||||
|
|
||||||
CONF = cfg.CONF
|
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('host', 'nova.config')
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
@ -72,7 +72,7 @@ libvirt_driver.libvirt = libvirt
|
|||||||
|
|
||||||
|
|
||||||
CONF = cfg.CONF
|
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('host', 'nova.config')
|
||||||
CONF.import_opt('my_ip', 'nova.config')
|
CONF.import_opt('my_ip', 'nova.config')
|
||||||
CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
|
CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
|
||||||
|
@ -57,10 +57,10 @@ from nova.virt.xenapi import volume_utils
|
|||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
CONF = cfg.CONF
|
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('compute_driver', 'nova.virt.driver')
|
||||||
CONF.import_opt('host', 'nova.config')
|
CONF.import_opt('host', 'nova.config')
|
||||||
CONF.import_opt('network_manager', 'nova.config')
|
|
||||||
CONF.import_opt('default_availability_zone', 'nova.availability_zones')
|
CONF.import_opt('default_availability_zone', 'nova.availability_zones')
|
||||||
|
|
||||||
IMAGE_MACHINE = '1'
|
IMAGE_MACHINE = '1'
|
||||||
|
Loading…
Reference in New Issue
Block a user