From 94d87bce212f91c54370784a5544f1a07625938a Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sat, 17 Nov 2012 22:50:17 +0000 Subject: Remove nova.config.CONF Modules import nova.config for two reasons right now - firstly, to reference nova.config.CONF and, secondly, if they use one of the options defined in nova.config. Often modules import nova.openstack.common.cfg and nova.config which is a bit pointless since they could just use cfg.CONF if they just want to nova.config in order to reference CONF. Let's just use cfg.CONF everywhere and we can explicitly state where we actually require options defined in nova.config. Change-Id: Ie4184a74e3e78c99658becb18dce1c2087e450bb --- nova/scheduler/rpcapi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/scheduler/rpcapi.py') diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index b0c83d695..5ddc65c59 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -19,10 +19,11 @@ Client side of the scheduler manager RPC API. """ from nova import config +from nova.openstack.common import cfg from nova.openstack.common import jsonutils import nova.openstack.common.rpc.proxy -CONF = config.CONF +CONF = cfg.CONF class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): -- cgit