From 3859af4596bd2fba6de0242e900ebd64ea0ae28a Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 21 Nov 2012 22:44:07 +0000 Subject: Move compute opts from nova.config A bunch of config options are declared in nova.config but only used in nova.compute.api or nova.compute.manager. Move them to the module which uses them. blueprint: scope-config-opts Change-Id: Id33182e9276f61e799305b6b743d1a1f34f25625 --- nova/tests/image/fake.py | 2 +- nova/tests/integrated/test_api_samples.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py index 20da3a883..9070a69d8 100644 --- a/nova/tests/image/fake.py +++ b/nova/tests/image/fake.py @@ -29,7 +29,7 @@ from nova.openstack.common import log as logging CONF = cfg.CONF -CONF.import_opt('null_kernel', 'nova.config') +CONF.import_opt('null_kernel', 'nova.compute.api') LOG = logging.getLogger(__name__) diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 5b1de9b7e..3a8488cd2 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -39,7 +39,7 @@ from nova.tests.image import fake from nova.tests.integrated import integrated_helpers CONF = cfg.CONF -CONF.import_opt('allow_resize_to_same_host', 'nova.config') +CONF.import_opt('allow_resize_to_same_host', 'nova.compute.api') CONF.import_opt('osapi_compute_extension', 'nova.config') CONF.import_opt('vpn_image_id', 'nova.config') LOG = logging.getLogger(__name__) -- cgit