Merge "Move scheduler_topic into nova.scheduler.rpcapi"

bin/nova-scheduler

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

nova/config.py

@@ -50,9 +50,6 @@ global_opts = [
     cfg.StrOpt('compute_topic',
                default='compute',
                help='the topic compute nodes listen on'),
-    cfg.StrOpt('scheduler_topic',
-               default='scheduler',
-               help='the topic scheduler nodes listen on'),
     cfg.ListOpt('enabled_apis',
                 default=['ec2', 'osapi_compute', 'metadata'],
                 help='a list of APIs to enable by default'),

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):

nova/tests/api/openstack/compute/test_servers.py

@@ -55,7 +55,7 @@ from nova.tests import matchers
 
 CONF = cfg.CONF
 CONF.import_opt('password_length', 'nova.utils')
-CONF.import_opt('scheduler_topic', 'nova.config')
+CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi')
 
 FAKE_UUID = fakes.FAKE_UUID
 NS = "{http://docs.openstack.org/compute/api/v1.1}"

nova/tests/scheduler/test_rpcapi.py

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

nova/tests/test_quota.py

@@ -34,7 +34,7 @@ from nova import test
 import nova.tests.image.fake
 
 CONF = cfg.CONF
-CONF.import_opt('scheduler_topic', 'nova.config')
+CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi')
 CONF.import_opt('compute_driver', 'nova.virt.driver')