x/python-ganttclient
Code Issues Proposed changes

Merge "Move scheduler_topic into nova.scheduler.rpcapi"

Browse Source
This commit is contained in:
Jenkins
2013-01-09 07:58:16 +00:00
committed by Gerrit Code Review
parent aeb3513d7b fdfb1f2ef2
commit 35844cce86
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-scheduler
View File

@@ -43,7 +43,7 @@ from nova import service
from nova import utils from nova import utils
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('scheduler_topic', 'nova.config') CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi')
if __name__ == '__main__': if __name__ == '__main__':
config.parse_args(sys.argv) config.parse_args(sys.argv)

8
nova/scheduler/rpcapi.py
View File

@@ -22,8 +22,14 @@ from nova.openstack.common import cfg
from nova.openstack.common import jsonutils from nova.openstack.common import jsonutils
import nova.openstack.common.rpc.proxy 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 = cfg.CONF
CONF.import_opt('scheduler_topic', 'nova.config') CONF.register_opts(rpcapi_opts)
class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):

1
nova/tests/scheduler/test_rpcapi.py
View File

@@ -25,7 +25,6 @@ from nova.scheduler import rpcapi as scheduler_rpcapi
from nova import test from nova import test
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('scheduler_topic', 'nova.config')
class SchedulerRpcAPITestCase(test.TestCase): class SchedulerRpcAPITestCase(test.TestCase):