From 94d87bce212f91c54370784a5544f1a07625938a Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
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/api/auth.py                                                 | 2 +-
 nova/api/ec2/__init__.py                                         | 2 +-
 nova/api/ec2/apirequest.py                                       | 1 -
 nova/api/ec2/cloud.py                                            | 3 ++-
 nova/api/ec2/ec2utils.py                                         | 1 -
 nova/api/ec2/faults.py                                           | 4 ++--
 nova/api/manager.py                                              | 3 ++-
 nova/api/metadata/base.py                                        | 3 +--
 nova/api/metadata/handler.py                                     | 3 ++-
 nova/api/openstack/auth.py                                       | 4 ++--
 nova/api/openstack/common.py                                     | 3 ++-
 nova/api/openstack/compute/__init__.py                           | 3 +--
 nova/api/openstack/compute/contrib/__init__.py                   | 3 ++-
 nova/api/openstack/compute/contrib/admin_actions.py              | 1 -
 nova/api/openstack/compute/contrib/certificates.py               | 1 -
 nova/api/openstack/compute/contrib/cloudpipe.py                  | 3 ++-
 nova/api/openstack/compute/contrib/config_drive.py               | 1 -
 nova/api/openstack/compute/contrib/extended_server_attributes.py | 1 -
 nova/api/openstack/compute/contrib/extended_status.py            | 1 -
 nova/api/openstack/compute/contrib/fping.py                      | 3 +--
 nova/api/openstack/compute/contrib/hosts.py                      | 1 -
 nova/api/openstack/compute/contrib/instance_usage_audit_log.py   | 3 ++-
 nova/api/openstack/compute/contrib/networks.py                   | 1 -
 nova/api/openstack/compute/contrib/rescue.py                     | 3 ++-
 nova/api/openstack/compute/contrib/security_groups.py            | 1 -
 nova/api/openstack/compute/contrib/services.py                   | 3 ++-
 nova/api/openstack/compute/contrib/simple_tenant_usage.py        | 1 -
 nova/api/openstack/compute/contrib/volumes.py                    | 1 -
 nova/api/openstack/compute/extensions.py                         | 3 ++-
 nova/api/openstack/compute/image_metadata.py                     | 1 -
 nova/api/openstack/compute/images.py                             | 1 -
 nova/api/openstack/compute/ips.py                                | 1 -
 nova/api/openstack/compute/servers.py                            | 3 ++-
 nova/api/openstack/compute/views/addresses.py                    | 1 -
 nova/api/openstack/compute/views/images.py                       | 3 ++-
 nova/api/openstack/compute/views/versions.py                     | 3 ++-
 nova/api/openstack/extensions.py                                 | 1 -
 nova/api/sizelimit.py                                            | 3 +--
 38 files changed, 36 insertions(+), 44 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/auth.py b/nova/api/auth.py
index 167c897cf..b00be750d 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -34,7 +34,7 @@ use_forwarded_for_opt = cfg.BoolOpt('use_forwarded_for',
         help='Treat X-Forwarded-For as the canonical remote address. '
              'Only enable this if you have a sanitizing proxy.')
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opt(use_forwarded_for_opt)
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index a4a52a22a..58c8c5d52 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -71,7 +71,7 @@ ec2_opts = [
                help='Time in seconds before ec2 timestamp expires'),
     ]
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(ec2_opts)
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index c3b2065b4..7e0f7986a 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -25,7 +25,6 @@ import datetime
 from xml.dom import minidom
 
 from nova.api.ec2 import ec2utils
-from nova import config
 from nova import exception
 from nova.openstack.common import log as logging
 
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index a061931b0..1c43661bb 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -38,6 +38,7 @@ from nova import db
 from nova import exception
 from nova.image import s3
 from nova import network
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import quota
@@ -45,7 +46,7 @@ from nova import utils
 from nova import volume
 
 
-CONF = config.CONF
+CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index 238bbecb9..d5beb017f 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/nova/api/ec2/ec2utils.py
@@ -18,7 +18,6 @@
 
 import re
 
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py
index fd2e46fcd..9299a946c 100644
--- a/nova/api/ec2/faults.py
+++ b/nova/api/ec2/faults.py
@@ -15,11 +15,11 @@
 import webob.dec
 import webob.exc
 
-from nova import config
 from nova import context
+from nova.openstack.common import cfg
 from nova import utils
 
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 class Fault(webob.exc.HTTPException):
diff --git a/nova/api/manager.py b/nova/api/manager.py
index d74e0ad24..a3fae4c10 100644
--- a/nova/api/manager.py
+++ b/nova/api/manager.py
@@ -18,9 +18,10 @@
 
 from nova import config
 from nova import manager
+from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 class MetadataManager(manager.Manager):
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 937938b40..8e5bcb370 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -25,7 +25,6 @@ import posixpath
 
 from nova.api.ec2 import ec2utils
 from nova import block_device
-from nova import config
 from nova import context
 from nova import db
 from nova import network
@@ -41,7 +40,7 @@ metadata_opts = [
                      'config drive')),
     ]
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(metadata_opts)
 CONF.import_opt('dhcp_domain', 'nova.network.manager')
 
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index 434d8deba..cca883405 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -25,10 +25,11 @@ import webob.exc
 from nova.api.metadata import base
 from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import wsgi
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py
index 4d680fa94..24276b2bd 100644
--- a/nova/api/openstack/auth.py
+++ b/nova/api/openstack/auth.py
@@ -21,13 +21,13 @@ import webob.dec
 import webob.exc
 
 from nova.api.openstack import wsgi
-from nova import config
 from nova import context
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import wsgi as base_wsgi
 
 LOG = logging.getLogger(__name__)
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 38247a55b..877fedaa8 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -30,12 +30,13 @@ from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import quota
 
 
 LOG = logging.getLogger(__name__)
-CONF = config.CONF
+CONF = cfg.CONF
 QUOTAS = quota.QUOTAS
 
 
diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py
index dc18a01a5..f88671733 100644
--- a/nova/api/openstack/compute/__init__.py
+++ b/nova/api/openstack/compute/__init__.py
@@ -31,7 +31,6 @@ from nova.api.openstack.compute import limits
 from nova.api.openstack.compute import server_metadata
 from nova.api.openstack.compute import servers
 from nova.api.openstack.compute import versions
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
@@ -42,7 +41,7 @@ allow_instance_snapshots_opt = cfg.BoolOpt('allow_instance_snapshots',
         default=True,
         help='Permit instance snapshot operations.')
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opt(allow_instance_snapshots_opt)
 
 
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index fc2943380..de912d6d8 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -23,10 +23,11 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 from nova.api.openstack import extensions
 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 
 
-CONF = config.CONF
+CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index 3614d7ba1..d651ed20a 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/nova/api/openstack/compute/contrib/admin_actions.py
@@ -23,7 +23,6 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova.compute import vm_states
-from nova import config
 from nova import exception
 from nova.openstack.common import log as logging
 
diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index c53fdabd5..11d819315 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -20,7 +20,6 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.cert.rpcapi
-from nova import config
 from nova import network
 from nova.openstack.common import log as logging
 
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index 302ff7cf3..c41052ef1 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -25,12 +25,13 @@ from nova import config
 from nova import db
 from nova import exception
 from nova import network
+from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 
-CONF = config.CONF
+CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'cloudpipe')
 
diff --git a/nova/api/openstack/compute/contrib/config_drive.py b/nova/api/openstack/compute/contrib/config_drive.py
index b972cf9b9..efdfe13ca 100644
--- a/nova/api/openstack/compute/contrib/config_drive.py
+++ b/nova/api/openstack/compute/contrib/config_drive.py
@@ -21,7 +21,6 @@ from nova.api.openstack.compute import servers
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 
 authorize = extensions.soft_extension_authorizer('compute', 'config_drive')
 
diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py
index 06847c727..51fd7f375 100644
--- a/nova/api/openstack/compute/contrib/extended_server_attributes.py
+++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py
@@ -18,7 +18,6 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
-from nova import config
 from nova import db
 from nova.openstack.common import log as logging
 
diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py
index 55ff930f2..759e361da 100644
--- a/nova/api/openstack/compute/contrib/extended_status.py
+++ b/nova/api/openstack/compute/contrib/extended_status.py
@@ -18,7 +18,6 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
-from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py
index 890119570..5afc6bc78 100644
--- a/nova/api/openstack/compute/contrib/fping.py
+++ b/nova/api/openstack/compute/contrib/fping.py
@@ -25,7 +25,6 @@ from webob import exc
 from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova import compute
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -42,7 +41,7 @@ fping_opts = [
                help="Full path to fping."),
 ]
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(fping_opts)
 
 
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index 32582548c..cc4144293 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -23,7 +23,6 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import api as compute_api
-from nova import config
 from nova import db
 from nova import exception
 from nova.openstack.common import log as logging
diff --git a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
index 31a66b8fe..825d14433 100644
--- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
+++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
@@ -23,9 +23,10 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova import config
 from nova import db
+from nova.openstack.common import cfg
 from nova import utils
 
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 authorize = extensions.extension_authorizer('compute',
diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py
index e7b7ac8a6..0a494ea88 100644
--- a/nova/api/openstack/compute/contrib/networks.py
+++ b/nova/api/openstack/compute/contrib/networks.py
@@ -21,7 +21,6 @@ import webob
 from webob import exc
 
 from nova.api.openstack import extensions
-from nova import config
 from nova import exception
 from nova import network
 from nova.openstack.common import log as logging
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index b76b54e8b..02a961c22 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -23,11 +23,12 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
 
 
-CONF = config.CONF
+CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 authorize = exts.extension_authorizer('compute', 'rescue')
 
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index ac5206a63..c382ce1d5 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -27,7 +27,6 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova.compute import api as compute_api
-from nova import config
 from nova import db
 from nova import exception
 from nova.openstack.common import log as logging
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py
index 6c3a6688d..793395b0b 100644
--- a/nova/api/openstack/compute/contrib/services.py
+++ b/nova/api/openstack/compute/contrib/services.py
@@ -24,6 +24,7 @@ from nova.api.openstack import xmlutil
 from nova import config
 from nova import db
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
@@ -31,7 +32,7 @@ from nova import utils
 
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'services')
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 class ServicesIndexTemplate(xmlutil.TemplateBuilder):
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
index c51faef1b..9fc2e97fb 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -22,7 +22,6 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import api
-from nova import config
 from nova import exception
 from nova.openstack.common import timeutils
 
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index c58a70d3c..abdef3a7d 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/nova/api/openstack/compute/contrib/volumes.py
@@ -24,7 +24,6 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
-from nova import config
 from nova import exception
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index 4805ba4e6..c92f8b19f 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/nova/api/openstack/compute/extensions.py
@@ -17,12 +17,13 @@
 
 from nova.api.openstack import extensions as base_extensions
 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common.plugin import pluginmanager
 
 
 LOG = logging.getLogger(__name__)
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 class ExtensionManager(base_extensions.ExtensionManager):
diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py
index 375bbc4d5..0c673f35e 100644
--- a/nova/api/openstack/compute/image_metadata.py
+++ b/nova/api/openstack/compute/image_metadata.py
@@ -19,7 +19,6 @@ from webob import exc
 
 from nova.api.openstack import common
 from nova.api.openstack import wsgi
-from nova import config
 from nova import exception
 from nova.image import glance
 
diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py
index bdd0e0916..7dda64f87 100644
--- a/nova/api/openstack/compute/images.py
+++ b/nova/api/openstack/compute/images.py
@@ -19,7 +19,6 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import images as views_images
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 from nova import exception
 import nova.image.glance
 from nova.openstack.common import log as logging
diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py
index a01066d0e..7b196d956 100644
--- a/nova/api/openstack/compute/ips.py
+++ b/nova/api/openstack/compute/ips.py
@@ -22,7 +22,6 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import addresses as view_addresses
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 2c22ccc48..e105969dd 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -32,6 +32,7 @@ from nova import compute
 from nova.compute import instance_types
 from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import common as rpc_common
@@ -41,7 +42,7 @@ from nova import utils
 
 
 LOG = logging.getLogger(__name__)
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 def make_fault(elem):
diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py
index c5ccb02fd..e1d75a9aa 100644
--- a/nova/api/openstack/compute/views/addresses.py
+++ b/nova/api/openstack/compute/views/addresses.py
@@ -18,7 +18,6 @@
 import itertools
 
 from nova.api.openstack import common
-from nova import config
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py
index 228af7c8d..cf6733431 100644
--- a/nova/api/openstack/compute/views/images.py
+++ b/nova/api/openstack/compute/views/images.py
@@ -19,9 +19,10 @@ import os.path
 
 from nova.api.openstack import common
 from nova import config
+from nova.openstack.common import cfg
 from nova import utils
 
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/nova/api/openstack/compute/views/versions.py b/nova/api/openstack/compute/views/versions.py
index 594369490..d3019ada6 100644
--- a/nova/api/openstack/compute/views/versions.py
+++ b/nova/api/openstack/compute/views/versions.py
@@ -20,9 +20,10 @@ import os
 
 from nova.api.openstack import common
 from nova import config
+from nova.openstack.common import cfg
 
 
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 def get_view_builder(req):
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index b44ebefbb..a94065ab0 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -24,7 +24,6 @@ import webob.exc
 import nova.api.openstack
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 from nova import exception
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py
index 95fa381ff..70ff73b2b 100644
--- a/nova/api/sizelimit.py
+++ b/nova/api/sizelimit.py
@@ -21,7 +21,6 @@ Request Body limiting middleware.
 import webob.dec
 import webob.exc
 
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import wsgi
@@ -33,7 +32,7 @@ max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size',
                                        help='the maximum body size '
                                             'per each osapi request(bytes)')
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opt(max_request_body_size_opt)
 LOG = logging.getLogger(__name__)
 
-- 
cgit