summaryrefslogtreecommitdiffstats
path: root/nova/config.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-01-08 07:20:09 +0000
committerMark McLoughlin <markmc@redhat.com>2013-01-09 08:15:42 +0000
commit39ce4032bb62bf62e84b9a4191e16a28e4a68454 (patch)
tree53f5c61aea60d9f7942cdc1433a486d26547a217 /nova/config.py
parenteac6e73223658595737ea001e1e0b18cfb4398c1 (diff)
downloadnova-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/config.py')
-rw-r--r--nova/config.py15
1 files changed, 0 insertions, 15 deletions
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. '