From b4af87863485b1dd074ba9f639f5cf5c78fa8fa1 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 8 Jan 2013 06:58:02 +0000 Subject: 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 --- nova/tests/api/openstack/compute/test_servers.py | 2 +- nova/tests/scheduler/test_rpcapi.py | 1 - nova/tests/test_quota.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index f916925fd..62eba8cd6 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/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}" diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index da7652a50..e9a1680a8 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/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): diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 28e9ccfda..2eec1574a 100644 --- a/nova/tests/test_quota.py +++ b/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') -- cgit