diff options
author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 06:58:02 +0000 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 10:23:40 +0000 |
commit | b4af87863485b1dd074ba9f639f5cf5c78fa8fa1 (patch) | |
tree | 2e3f38e6f6c5b4294b8c01fdd91e39f1ef2d98a8 /nova/scheduler/rpcapi.py | |
parent | 7a5e72d80d78049c8941a7d7ac1fb72bd9ccd2d0 (diff) | |
download | nova-b4af87863485b1dd074ba9f639f5cf5c78fa8fa1.tar.gz nova-b4af87863485b1dd074ba9f639f5cf5c78fa8fa1.tar.xz nova-b4af87863485b1dd074ba9f639f5cf5c78fa8fa1.zip |
Move scheduler_topic into nova.scheduler.rpcapi
The scheduler_topic opt is only used in nova.scheduler.rpcapi and it
makes sense for the RPC module to "own" the topic option.
blueprint: scope-config-opts
Change-Id: Iafb8705eb716b650b63e060fe1dd36666bcee812
Diffstat (limited to 'nova/scheduler/rpcapi.py')
-rw-r--r-- | nova/scheduler/rpcapi.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 6ae4adcae..c3a37d6ad 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -22,8 +22,14 @@ from nova.openstack.common import cfg from nova.openstack.common import jsonutils import nova.openstack.common.rpc.proxy +rpcapi_opts = [ + cfg.StrOpt('scheduler_topic', + default='scheduler', + help='the topic scheduler nodes listen on'), +] + CONF = cfg.CONF -CONF.import_opt('scheduler_topic', 'nova.config') +CONF.register_opts(rpcapi_opts) class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): |