diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 07:20:09 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 08:15:42 +0000 |
| commit | 39ce4032bb62bf62e84b9a4191e16a28e4a68454 (patch) | |
| tree | 53f5c61aea60d9f7942cdc1433a486d26547a217 /nova/service.py | |
| parent | eac6e73223658595737ea001e1e0b18cfb4398c1 (diff) | |
| download | nova-39ce4032bb62bf62e84b9a4191e16a28e4a68454.tar.gz nova-39ce4032bb62bf62e84b9a4191e16a28e4a68454.tar.xz nova-39ce4032bb62bf62e84b9a4191e16a28e4a68454.zip | |
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
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 16 |
1 files changed, 15 insertions, 1 deletions
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 |