From 02fab17553dd4a7d2f3a524c3df59367f695ef56 Mon Sep 17 00:00:00 2001 From: Markus Zoeller Date: Fri, 4 Dec 2015 11:53:26 +0100 Subject: [PATCH] Config options: centralize section "scheduler" That's a follow-up patch for commit 5dbdd6ed2bdc Blueprint centralize-config-options Change-Id: Idfc6af2ca6ed70f7191efd4111eae5f3c16566d1 --- nova/tests/unit/conf_fixture.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/tests/unit/conf_fixture.py b/nova/tests/unit/conf_fixture.py index c7f37b9b8615..c83a4411bd76 100644 --- a/nova/tests/unit/conf_fixture.py +++ b/nova/tests/unit/conf_fixture.py @@ -14,15 +14,15 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_config import cfg from oslo_config import fixture as config_fixture +import nova.conf from nova import config from nova import ipv6 from nova import paths from nova.tests.unit import utils -CONF = cfg.CONF +CONF = nova.conf.CONF CONF.import_opt('use_ipv6', 'nova.netconf') CONF.import_opt('host', 'nova.netconf') CONF.import_opt('fake_network', 'nova.network.linux_net')