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
11 years ago · 94d87bce21
parent e60d593b5e
commit 94d87bce21
251 changed files with 323 additions and 343 deletions
--- a/bin/nova-all
+++ b/bin/nova-all
@ -42,13 +42,14 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):

 from nova import config
 from nova.objectstore import s3server
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 from nova.vnc import xvp_proxy


-CONF = config.CONF
+CONF = cfg.CONF
 LOG = logging.getLogger('nova.all')

 if __name__ == '__main__':
--- a/bin/nova-api
+++ b/bin/nova-api
@ -37,11 +37,12 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):


 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF

 if __name__ == '__main__':
    config.parse_args(sys.argv)
--- a/bin/nova-cert
+++ b/bin/nova-cert
@ -33,11 +33,12 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):


 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF

 if __name__ == '__main__':
    config.parse_args(sys.argv)
--- a/bin/nova-clear-rabbit-queues
+++ b/bin/nova-clear-rabbit-queues
@ -52,7 +52,7 @@ delete_exchange_opt = cfg.BoolOpt('delete_exchange',
                                  default=False,
                                  help='delete nova exchange too.')

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_cli_opt(delete_exchange_opt)


--- a/bin/nova-compute
+++ b/bin/nova-compute
@ -42,11 +42,12 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):


 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF

 if __name__ == '__main__':
    config.parse_args(sys.argv)
--- a/bin/nova-conductor
+++ b/bin/nova-conductor
@ -33,11 +33,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):


 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.import_opt('topic', 'nova.conductor.api', group='conductor')

 if __name__ == '__main__':
--- a/bin/nova-console
+++ b/bin/nova-console
@ -34,10 +34,11 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):


 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service

-CONF = config.CONF
+CONF = cfg.CONF

 if __name__ == '__main__':
    config.parse_args(sys.argv)
--- a/bin/nova-consoleauth
+++ b/bin/nova-consoleauth
@ -33,10 +33,11 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):

 from nova import config
 from nova.consoleauth import manager
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service

-CONF = config.CONF
+CONF = cfg.CONF

 if __name__ == "__main__":
    config.parse_args(sys.argv)
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@ -40,12 +40,13 @@ from nova import context
 from nova import db
 from nova.network import linux_net
 from nova.network import rpcapi as network_rpcapi
+from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF
 LOG = logging.getLogger('nova.dhcpbridge')


--- a/bin/nova-manage
+++ b/bin/nova-manage
@ -88,7 +88,7 @@ from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import utils
 from nova import version

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.import_opt('flat_network_bridge', 'nova.network.manager')
 CONF.import_opt('num_networks', 'nova.network.manager')
 CONF.import_opt('multi_host', 'nova.network.manager')
--- a/bin/nova-network
+++ b/bin/nova-network
@ -35,11 +35,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):


 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF

 if __name__ == '__main__':
    config.parse_args(sys.argv)
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@ -67,7 +67,7 @@ opts = [
               help='Port on which to listen for incoming requests'),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_cli_opts(opts)
 LOG = logging.getLogger(__name__)

--- a/bin/nova-rpc-zmq-receiver
+++ b/bin/nova-rpc-zmq-receiver
@ -34,12 +34,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):

 from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova.openstack.common.rpc import impl_zmq
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(rpc.rpc_opts)
 CONF.register_opts(impl_zmq.zmq_opts)

--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@ -37,11 +37,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 gettext.install('nova', unicode=1)

 from nova import config
+from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import service
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF

 if __name__ == '__main__':
    config.parse_args(sys.argv)
--- 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__)

--- 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')

--- 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

--- 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__)

--- 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
--- 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):
--- 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):
--- 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')

--- 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__)
--- 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')


--- 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


--- 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)


--- 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__)


--- 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

--- 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

--- 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')

--- 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')

--- 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

--- 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__)
--- 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)


--- 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
--- 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',
--- 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
--- 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')

--- 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
--- 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):
--- 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

--- 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
--- 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):
--- 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

--- 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
--- 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__)
--- 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):
--- 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__)
--- 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):
--- 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):
--- 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
--- 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__)

--- a/nova/block_device.py
+++ b/nova/block_device.py
@ -18,8 +18,9 @@
 import re

 from nova import config
+from nova.openstack.common import cfg

-CONF = config.CONF
+CONF = cfg.CONF

 DEFAULT_ROOT_DEV_NAME = '/dev/sda1'
 _DEFAULT_MAPPINGS = {'ami': 'sda1',
--- a/nova/cert/manager.py
+++ b/nova/cert/manager.py
@ -26,7 +26,6 @@ Cert manager manages x509 certificates.

 import base64

-from nova import config
 from nova import crypto
 from nova import manager
 from nova.openstack.common import log as logging
--- a/nova/cert/rpcapi.py
+++ b/nova/cert/rpcapi.py
@ -19,9 +19,10 @@ Client side of the cert manager RPC API.
 """

 from nova import config
+from nova.openstack.common import cfg
 import nova.openstack.common.rpc.proxy

-CONF = config.CONF
+CONF = cfg.CONF


 class CertAPI(nova.openstack.common.rpc.proxy.RpcProxy):
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@ -53,7 +53,7 @@ cloudpipe_opts = [
               help=_('Netmask to push into openvpn config')),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(cloudpipe_opts)
 CONF.import_opt('cnt_vpn_clients', 'nova.network.manager')

--- a/nova/compute/init.py
+++ b/nova/compute/init.py
@ -18,11 +18,12 @@

 # Importing full names to not pollute the namespace and cause possible
 # collisions with use of 'from nova.compute import <foo>' elsewhere.
-import nova.config
+import nova.openstack.common.cfg
 import nova.openstack.common.importutils


 def API(*args, **kwargs):
    importutils = nova.openstack.common.importutils
-    cls = importutils.import_class(nova.config.CONF.compute_api_class)
+    compute_api_class = nova.openstack.common.cfg.CONF.compute_api_class
+    cls = importutils.import_class(compute_api_class)
    return cls(*args, **kwargs)
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@ -44,6 +44,7 @@ from nova import exception
 from nova.image import glance
 from nova import network
 from nova import notifications
+from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
@ -59,7 +60,7 @@ from nova import volume

 LOG = logging.getLogger(__name__)

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.import_opt('consoleauth_topic', 'nova.consoleauth')

 MAX_USERDATA_SIZE = 65535
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@ -27,10 +27,11 @@ from nova import config
 from nova import context
 from nova import db
 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__)

 INVALID_NAME_REGEX = re.compile("[^\w\.\- ]")
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@ -141,7 +141,7 @@ compute_opts = [
               help="Generate periodic compute.instance.exists notifications"),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(compute_opts)

 QUOTAS = quota.QUOTAS
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@ -23,7 +23,6 @@ from nova.compute import claims
 from nova.compute import instance_types
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@ -44,7 +43,7 @@ resource_tracker_opts = [
               help='Class that will manage stats for the local compute host')
 ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(resource_tracker_opts)

 LOG = logging.getLogger(__name__)
--- a/nova/compute/rpcapi.py
+++ b/nova/compute/rpcapi.py
@ -20,11 +20,12 @@ Client side of the compute RPC API.

 from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import rpc
 import nova.openstack.common.rpc.proxy

-CONF = config.CONF
+CONF = cfg.CONF


 def _compute_topic(topic, ctxt, host, instance):
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@ -27,11 +27,12 @@ from nova import db
 from nova import exception
 from nova.network import model as network_model
 from nova import notifications
+from nova.openstack.common import cfg
 from nova.openstack.common import log
 from nova.openstack.common.notifier import api as notifier_api
 from nova import utils

-CONF = config.CONF
+CONF = cfg.CONF
 LOG = log.getLogger(__name__)


--- a/nova/conductor/init.py
+++ b/nova/conductor/init.py
@ -14,11 +14,12 @@

 from nova.conductor import api as conductor_api
 import nova.config
+import nova.openstack.common.cfg
 import nova.openstack.common.importutils


 def API(*args, **kwargs):
-    if nova.config.CONF.conductor.use_local:
+    if nova.openstack.common.cfg.CONF.conductor.use_local:
        api = conductor_api.LocalAPI
    else:
        api = conductor_api.API
--- a/nova/conductor/api.py
+++ b/nova/conductor/api.py
@ -32,7 +32,7 @@ conductor_opts = [
 ]
 conductor_group = cfg.OptGroup(name='conductor',
                               title='Conductor Options')
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_group(conductor_group)
 CONF.register_opts(conductor_opts, conductor_group)

--- a/nova/conductor/rpcapi.py
+++ b/nova/conductor/rpcapi.py
@ -15,9 +15,10 @@
 """Client side of the conductor RPC API"""

 from nova import config
+from nova.openstack.common import cfg
 import nova.openstack.common.rpc.proxy

-CONF = config.CONF
+CONF = cfg.CONF


 class ConductorAPI(nova.openstack.common.rpc.proxy.RpcProxy):
--- a/nova/config.py
+++ b/nova/config.py
@ -22,8 +22,6 @@ import socket

 from nova.openstack.common import cfg

-CONF = cfg.CONF
-

 def _get_my_ip():
    """
@ -77,8 +75,8 @@ debug_opts = [
               help='Add python stack traces to SQL as comment strings'),
 ]

-CONF.register_cli_opts(core_opts)
-CONF.register_cli_opts(debug_opts)
+cfg.CONF.register_cli_opts(core_opts)
+cfg.CONF.register_cli_opts(debug_opts)

 global_opts = [
    cfg.StrOpt('my_ip',
@ -372,11 +370,11 @@ global_opts = [
                   'vmwareapi.VMWareESXDriver'),
 ]

-CONF.register_opts(global_opts)
+cfg.CONF.register_opts(global_opts)


 def parse_args(argv, default_config_files=None):
-    CONF.disable_interspersed_args()
-    return argv[:1] + CONF(argv[1:],
-                           project='nova',
-                           default_config_files=default_config_files)
+    cfg.CONF.disable_interspersed_args()
+    return argv[:1] + cfg.CONF(argv[1:],
+                               project='nova',
+                               default_config_files=default_config_files)
--- a/nova/console/api.py
+++ b/nova/console/api.py
@ -21,10 +21,11 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova import config
 from nova.console import rpcapi as console_rpcapi
 from nova.db import base
+from nova.openstack.common import cfg
 from nova.openstack.common import rpc
 from nova.openstack.common import uuidutils

-CONF = config.CONF
+CONF = cfg.CONF


 class API(base.Base):
--- a/nova/console/manager.py
+++ b/nova/console/manager.py
@ -20,7 +20,6 @@
 import socket

 from nova.compute import rpcapi as compute_rpcapi
-from nova import config
 from nova import exception
 from nova import manager
 from nova.openstack.common import cfg
@ -41,7 +40,7 @@ console_manager_opts = [
               help='Publicly visible name for this console host'),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(console_manager_opts)
 LOG = logging.getLogger(__name__)

--- a/nova/console/rpcapi.py
+++ b/nova/console/rpcapi.py
@ -19,9 +19,10 @@ Client side of the console RPC API.
 """

 from nova import config
+from nova.openstack.common import cfg
 import nova.openstack.common.rpc.proxy

-CONF = config.CONF
+CONF = cfg.CONF


 class ConsoleAPI(nova.openstack.common.rpc.proxy.RpcProxy):
--- a/nova/console/vmrc.py
+++ b/nova/console/vmrc.py
@ -19,7 +19,6 @@

 import base64

-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@ -35,7 +34,7 @@ vmrc_opts = [
               help="number of retries for retrieving VMRC information"),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(vmrc_opts)


--- a/nova/console/vmrc_manager.py
+++ b/nova/console/vmrc_manager.py
@ -18,7 +18,6 @@
 """VMRC Console Manager."""

 from nova.compute import rpcapi as compute_rpcapi
-from nova import config
 from nova import exception
 from nova import manager
 from nova.openstack.common import cfg
@ -29,7 +28,7 @@ from nova.virt.vmwareapi import driver as vmwareapi_conn

 LOG = logging.getLogger(__name__)

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.import_opt('console_driver', 'nova.console.manager')
 CONF.import_opt('console_public_hostname', 'nova.console.manager')

--- a/nova/console/xvp.py
+++ b/nova/console/xvp.py
@ -49,7 +49,7 @@ xvp_opts = [
               help='port for XVP to multiplex VNC connections on'),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(xvp_opts)
 LOG = logging.getLogger(__name__)

--- a/nova/consoleauth/init.py
+++ b/nova/consoleauth/init.py
@ -18,7 +18,6 @@

 """Module to authenticate Consoles."""

-from nova import config
 from nova.openstack.common import cfg


@ -26,5 +25,5 @@ consoleauth_topic_opt = cfg.StrOpt('consoleauth_topic',
        default='consoleauth',
        help='the topic console auth proxy nodes listen on')

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opt(consoleauth_topic_opt)
--- a/nova/consoleauth/manager.py
+++ b/nova/consoleauth/manager.py
@ -38,7 +38,7 @@ consoleauth_opts = [
               help='Manager for console auth'),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(consoleauth_opts)


--- a/nova/consoleauth/rpcapi.py
+++ b/nova/consoleauth/rpcapi.py
@ -18,10 +18,10 @@
 Client side of the consoleauth RPC API.
 """

-from nova import config
+from nova.openstack.common import cfg
 import nova.openstack.common.rpc.proxy

-CONF = config.CONF
+CONF = cfg.CONF


 class ConsoleAuthAPI(nova.openstack.common.rpc.proxy.RpcProxy):
--- a/nova/crypto.py
+++ b/nova/crypto.py
@ -72,7 +72,7 @@ crypto_opts = [
                      'project, timestamp')),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(crypto_opts)


--- a/nova/db/api.py
+++ b/nova/db/api.py
@ -43,7 +43,6 @@ these objects be simple dictionaries.

 """

-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova import utils
@ -64,7 +63,7 @@ db_opts = [
               help='Template string to be used to generate snapshot names'),
    ]

-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(db_opts)

 IMPL = utils.LazyPluggable('db_backend',
--- a/nova/db/base.py
+++ b/nova/db/base.py
@ -18,7 +18,6 @@

 """Base class for classes that need modular database access."""

-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils