Use CONF.import_opt() for nova.config opts

The only reason for importing nova.config now is where one of the
options defined in that file is needed. Rather than importing
nova.config using an import statement, use CONF.import_opt() so
that it is clear which option we actually require.

In future, we will move many options out of nova.config so many
of these import_opt() calls will either go away or cause a module
other than nova.config to be imported.

Change-Id: I0646efddecdf2530903afd50c1f4364cb1d5dce1

98 files changed, 189 insertions, 101 deletions

diff --git a/nova/api/auth.py b/nova/api/auth.py
index b00be750d..c51d4d0db 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -21,7 +21,6 @@ Common Auth Middleware.
 import webob.dec
 import webob.exc
 
-from nova import config
 from nova import context
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -36,6 +35,8 @@ use_forwarded_for_opt = cfg.BoolOpt('use_forwarded_for',
 
 CONF = cfg.CONF
 CONF.register_opt(use_forwarded_for_opt)
+CONF.import_opt('api_rate_limit', 'nova.config')
+CONF.import_opt('auth_strategy', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 58c8c5d52..28b946a8b 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -31,7 +31,6 @@ from nova.api.ec2 import apirequest
 from nova.api.ec2 import ec2utils
 from nova.api.ec2 import faults
 from nova.api import validator
-from nova import config
 from nova import context
 from nova import exception
 from nova.openstack.common import cfg
@@ -73,6 +72,7 @@ ec2_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(ec2_opts)
+CONF.import_opt('memcached_servers', 'nova.config')
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 1c43661bb..aca4ab3b2 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -33,7 +33,6 @@ from nova import compute
 from nova.compute import api as compute_api
 from nova.compute import instance_types
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova import exception
 from nova.image import s3
@@ -47,6 +46,13 @@ from nova import volume
 
 
 CONF = cfg.CONF
+CONF.import_opt('ec2_host', 'nova.config')
+CONF.import_opt('ec2_path', 'nova.config')
+CONF.import_opt('ec2_port', 'nova.config')
+CONF.import_opt('ec2_scheme', 'nova.config')
+CONF.import_opt('region_list', 'nova.config')
+CONF.import_opt('vpn_image_id', 'nova.config')
+CONF.import_opt('vpn_key_suffix', 'nova.config')
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/api/manager.py b/nova/api/manager.py
index a3fae4c10..04607d751 100644
--- a/nova/api/manager.py
+++ b/nova/api/manager.py
@@ -16,12 +16,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova import manager
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 
 CONF = cfg.CONF
+CONF.import_opt('network_driver', 'nova.config')
 
 
 class MetadataManager(manager.Manager):
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index cca883405..bbf1f9318 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -23,13 +23,13 @@ import webob.dec
 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 = cfg.CONF
+CONF.import_opt('memcached_servers', 'nova.config')
 CONF.import_opt('use_forwarded_for', 'nova.api.auth')
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 877fedaa8..c3d0c2f94 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -28,7 +28,6 @@ from nova.api.openstack import xmlutil
 from nova.compute import task_states
 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
@@ -37,6 +36,8 @@ from nova import quota
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_link_prefix', 'nova.config')
+CONF.import_opt('osapi_max_limit', 'nova.config')
 QUOTAS = quota.QUOTAS
 
 
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index de912d6d8..ec09ae941 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -22,12 +22,12 @@ 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 = cfg.CONF
+CONF.import_opt('osapi_compute_ext_list', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index c41052ef1..1b60f6c1f 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -21,7 +21,6 @@ from nova.cloudpipe import pipelib
 from nova import compute
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova import exception
 from nova import network
@@ -32,6 +31,7 @@ from nova.openstack.common import timeutils
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('vpn_image_id', 'nova.config')
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'cloudpipe')
 
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 825d14433..bec9261ab 100644
--- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
+++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
@@ -21,12 +21,12 @@ import datetime
 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 = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 
 
 authorize = extensions.extension_authorizer('compute',
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index 02a961c22..8aff90c38 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -21,7 +21,6 @@ from nova.api.openstack import common
 from nova.api.openstack import extensions as exts
 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
@@ -29,6 +28,7 @@ from nova import utils
 
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 LOG = logging.getLogger(__name__)
 authorize = exts.extension_authorizer('compute', 'rescue')
 
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py
index 793395b0b..3114c3ae4 100644
--- a/nova/api/openstack/compute/contrib/services.py
+++ b/nova/api/openstack/compute/contrib/services.py
@@ -21,7 +21,6 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 from nova import db
 from nova import exception
 from nova.openstack.common import cfg
@@ -33,6 +32,7 @@ from nova import utils
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'services')
 CONF = cfg.CONF
+CONF.import_opt('service_down_time', 'nova.config')
 
 
 class ServicesIndexTemplate(xmlutil.TemplateBuilder):
diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index c92f8b19f..d3c31daca 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/nova/api/openstack/compute/extensions.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 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
@@ -24,6 +23,7 @@ from nova.openstack.common.plugin import pluginmanager
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension', 'nova.config')
 
 
 class ExtensionManager(base_extensions.ExtensionManager):
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index e105969dd..1b758f23f 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -30,7 +30,6 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 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
@@ -43,6 +42,10 @@ from nova import utils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('enable_instance_password', 'nova.config')
+CONF.import_opt('network_api_class', 'nova.config')
+CONF.import_opt('password_length', 'nova.config')
+CONF.import_opt('reclaim_instance_interval', 'nova.config')
 
 
 def make_fault(elem):
diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py
index cf6733431..84326f356 100644
--- a/nova/api/openstack/compute/views/images.py
+++ b/nova/api/openstack/compute/views/images.py
@@ -18,11 +18,11 @@
 import os.path
 
 from nova.api.openstack import common
-from nova import config
 from nova.openstack.common import cfg
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_glance_link_prefix', 'nova.config')
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/nova/api/openstack/compute/views/versions.py b/nova/api/openstack/compute/views/versions.py
index d3019ada6..a8c4286dd 100644
--- a/nova/api/openstack/compute/views/versions.py
+++ b/nova/api/openstack/compute/views/versions.py
@@ -19,11 +19,11 @@ import copy
 import os
 
 from nova.api.openstack import common
-from nova import config
 from nova.openstack.common import cfg
 
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_link_prefix', 'nova.config')
 
 
 def get_view_builder(req):
diff --git a/nova/block_device.py b/nova/block_device.py
index 7c06f4898..a3c28d3ed 100644
--- a/nova/block_device.py
+++ b/nova/block_device.py
@@ -17,10 +17,10 @@
 
 import re
 
-from nova import config
 from nova.openstack.common import cfg
 
 CONF = cfg.CONF
+CONF.import_opt('compute_driver', 'nova.config')
 
 DEFAULT_ROOT_DEV_NAME = '/dev/sda1'
 _DEFAULT_MAPPINGS = {'ami': 'sda1',
diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py
index da64be436..35d02b643 100644
--- a/nova/cert/rpcapi.py
+++ b/nova/cert/rpcapi.py
@@ -18,11 +18,11 @@
 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 = cfg.CONF
+CONF.import_opt('cert_topic', 'nova.config')
 
 
 class CertAPI(nova.openstack.common.rpc.proxy.RpcProxy):
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 5fa8dd702..274bdf5b5 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -28,7 +28,6 @@ import zipfile
 
 from nova import compute
 from nova.compute import instance_types
-from nova import config
 from nova import crypto
 from nova import db
 from nova import exception
@@ -55,6 +54,11 @@ cloudpipe_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(cloudpipe_opts)
+CONF.import_opt('ec2_dmz_host', 'nova.config')
+CONF.import_opt('ec2_port', 'nova.config')
+CONF.import_opt('vpn_image_id', 'nova.config')
+CONF.import_opt('vpn_key_suffix', 'nova.config')
+CONF.import_opt('pybasedir', 'nova.config')
 CONF.import_opt('cnt_vpn_clients', 'nova.network.manager')
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 4d2e2534f..e10c0b47d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -36,7 +36,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova import crypto
 from nova.db import base
@@ -61,6 +60,12 @@ from nova import volume
 LOG = logging.getLogger(__name__)
 
 CONF = cfg.CONF
+CONF.import_opt('allow_resize_to_same_host', 'nova.config')
+CONF.import_opt('compute_topic', 'nova.config')
+CONF.import_opt('default_schedule_zone', 'nova.config')
+CONF.import_opt('non_inheritable_image_properties', 'nova.config')
+CONF.import_opt('null_kernel', 'nova.config')
+CONF.import_opt('security_group_handler', 'nova.config')
 CONF.import_opt('consoleauth_topic', 'nova.consoleauth')
 
 MAX_USERDATA_SIZE = 65535
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index 630b86da1..906a5b4f9 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -23,7 +23,6 @@
 import re
 import uuid
 
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -32,6 +31,7 @@ from nova.openstack.common import log as logging
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('default_instance_type', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 INVALID_NAME_REGEX = re.compile("[^\w\.\- ]")
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index a0bf61697..3edd05b88 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -53,7 +53,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 import nova.context
 from nova import exception
 from nova.image import glance
@@ -143,6 +142,22 @@ compute_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(compute_opts)
+CONF.import_opt('allow_resize_to_same_host', 'nova.config')
+CONF.import_opt('bandwidth_poll_interval', 'nova.config')
+CONF.import_opt('compute_driver', 'nova.config')
+CONF.import_opt('console_topic', 'nova.config')
+CONF.import_opt('default_access_ip_network_name', 'nova.config')
+CONF.import_opt('defer_iptables_apply', 'nova.config')
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('my_ip', 'nova.config')
+CONF.import_opt('network_manager', 'nova.config')
+CONF.import_opt('password_length', 'nova.config')
+CONF.import_opt('reclaim_instance_interval', 'nova.config')
+CONF.import_opt('resume_guests_state_on_host_boot', 'nova.config')
+CONF.import_opt('start_guests_on_host_boot', 'nova.config')
+CONF.import_opt('vpn_image_id', 'nova.config')
+CONF.import_opt('my_ip', 'nova.config')
+CONF.import_opt('state_path', 'nova.config')
 
 QUOTAS = quota.QUOTAS
 
diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py
index 52386ef87..2b63004bc 100644
--- a/nova/compute/rpcapi.py
+++ b/nova/compute/rpcapi.py
@@ -18,7 +18,6 @@
 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
@@ -26,6 +25,7 @@ from nova.openstack.common import rpc
 import nova.openstack.common.rpc.proxy
 
 CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 
 
 def _compute_topic(topic, ctxt, host, instance):
diff --git a/nova/compute/utils.py b/nova/compute/utils.py
index f2eace6ae..ee711993d 100644
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@@ -22,7 +22,6 @@ import traceback
 
 from nova import block_device
 from nova.compute import instance_types
-from nova import config
 from nova import db
 from nova import exception
 from nova.network import model as network_model
@@ -33,6 +32,8 @@ from nova.openstack.common.notifier import api as notifier_api
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('compute_driver', 'nova.config')
+CONF.import_opt('host', 'nova.config')
 LOG = log.getLogger(__name__)
 
 
diff --git a/nova/conductor/__init__.py b/nova/conductor/__init__.py
index fb1fd26d3..1e31da54c 100644
--- a/nova/conductor/__init__.py
+++ b/nova/conductor/__init__.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 from nova.conductor import api as conductor_api
-import nova.config
 import nova.openstack.common.cfg
 import nova.openstack.common.importutils
 
diff --git a/nova/conductor/api.py b/nova/conductor/api.py
index 282005fcd..cef5d3501 100644
--- a/nova/conductor/api.py
+++ b/nova/conductor/api.py
@@ -16,7 +16,6 @@
 
 from nova.conductor import manager
 from nova.conductor import rpcapi
-from nova import config
 from nova.openstack.common import cfg
 
 conductor_opts = [
diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py
index 123aa0b87..a51b3a9f1 100644
--- a/nova/conductor/rpcapi.py
+++ b/nova/conductor/rpcapi.py
@@ -14,7 +14,6 @@
 
 """Client side of the conductor RPC API"""
 
-from nova import config
 from nova.openstack.common import cfg
 import nova.openstack.common.rpc.proxy
 
diff --git a/nova/console/api.py b/nova/console/api.py
index ead6a1889..7eb7a31e2 100644
--- a/nova/console/api.py
+++ b/nova/console/api.py
@@ -18,7 +18,6 @@
 """Handles ConsoleProxy API requests."""
 
 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
@@ -26,6 +25,7 @@ from nova.openstack.common import rpc
 from nova.openstack.common import uuidutils
 
 CONF = cfg.CONF
+CONF.import_opt('console_topic', 'nova.config')
 
 
 class API(base.Base):
diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py
index 41258c8ba..8c31bb97f 100644
--- a/nova/console/rpcapi.py
+++ b/nova/console/rpcapi.py
@@ -18,11 +18,11 @@
 Client side of the console RPC API.
 """
 
-from nova import config
 from nova.openstack.common import cfg
 import nova.openstack.common.rpc.proxy
 
 CONF = cfg.CONF
+CONF.import_opt('console_topic', 'nova.config')
 
 
 class ConsoleAPI(nova.openstack.common.rpc.proxy.RpcProxy):
diff --git a/nova/console/xvp.py b/nova/console/xvp.py
index 5d23efec6..8b2db090b 100644
--- a/nova/console/xvp.py
+++ b/nova/console/xvp.py
@@ -22,7 +22,6 @@ import signal
 
 from Cheetah import Template
 
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -51,6 +50,8 @@ xvp_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(xvp_opts)
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('pybasedir', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py
index b4747b1b1..910332633 100644
--- a/nova/consoleauth/manager.py
+++ b/nova/consoleauth/manager.py
@@ -20,7 +20,6 @@
 
 import time
 
-from nova import config
 from nova import manager
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -40,6 +39,7 @@ consoleauth_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(consoleauth_opts)
+CONF.import_opt('memcached_servers', 'nova.config')
 
 
 class ConsoleAuthManager(manager.Manager):
diff --git a/nova/crypto.py b/nova/crypto.py
index b07f4016a..73af2f25a 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -28,7 +28,6 @@ import hashlib
 import os
 import string
 
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -74,6 +73,7 @@ crypto_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(crypto_opts)
+CONF.import_opt('state_path', 'nova.config')
 
 
 def ca_folder(project_id=None):
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 0d6dd8b90..30ef47cf3 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -38,7 +38,6 @@ from sqlalchemy.sql import func
 from nova import block_device
 from nova.common.sqlalchemyutils import paginate_query
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
@@ -50,6 +49,8 @@ from nova.openstack.common import uuidutils
 
 
 CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
+CONF.import_opt('sql_connection', 'nova.config')
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py
index a02be8ee2..6c0564b0b 100644
--- a/nova/db/sqlalchemy/session.py
+++ b/nova/db/sqlalchemy/session.py
@@ -169,13 +169,17 @@ import sqlalchemy.interfaces
 import sqlalchemy.orm
 from sqlalchemy.pool import NullPool, StaticPool
 
-from nova import config
 import nova.exception
 from nova.openstack.common import cfg
 import nova.openstack.common.log as logging
 
 
 CONF = cfg.CONF
+CONF.import_opt('sql_connection', 'nova.config')
+CONF.import_opt('sql_idle_timeout', 'nova.config')
+CONF.import_opt('sqlite_synchronous', 'nova.config')
+CONF.import_opt('sql_max_retries', 'nova.config')
+CONF.import_opt('sql_retry_interval', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 _ENGINE = None
diff --git a/nova/image/glance.py b/nova/image/glance.py
index d2f69d12e..c4e117b71 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -29,7 +29,6 @@ import urlparse
 import glanceclient
 import glanceclient.exc
 
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -39,6 +38,10 @@ from nova.openstack.common import timeutils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('auth_strategy', 'nova.config')
+CONF.import_opt('glance_api_insecure', 'nova.config')
+CONF.import_opt('glance_api_servers', 'nova.config')
+CONF.import_opt('glance_num_retries', 'nova.config')
 
 
 def _parse_image_ref(image_href):
diff --git a/nova/image/s3.py b/nova/image/s3.py
index 0d93383fb..b5bb3436e 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -31,7 +31,6 @@ from lxml import etree
 
 from nova.api.ec2 import ec2utils
 import nova.cert.rpcapi
-from nova import config
 from nova import exception
 from nova.image import glance
 from nova.openstack.common import cfg
@@ -62,6 +61,8 @@ s3_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(s3_opts)
+CONF.import_opt('s3_host', 'nova.config')
+CONF.import_opt('s3_port', 'nova.config')
 
 
 class S3ImageService(object):
diff --git a/nova/manager.py b/nova/manager.py
index 59da6155a..044d5f8cb 100644
--- a/nova/manager.py
+++ b/nova/manager.py
@@ -55,7 +55,6 @@ This module provides Manager, a base class for managers.
 
 import eventlet
 
-from nova import config
 from nova.db import base
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -65,6 +64,7 @@ from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import version
 
 CONF = cfg.CONF
+CONF.import_opt('host', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 158d56463..4bd65e49b 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -24,7 +24,6 @@ import inspect
 import netaddr
 import os
 
-from nova import config
 from nova import db
 from nova import exception
 from nova.openstack.common import cfg
@@ -89,6 +88,14 @@ linux_net_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(linux_net_opts)
+CONF.import_opt('bindir', 'nova.config')
+CONF.import_opt('fake_network', 'nova.config')
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('metadata_host', 'nova.config')
+CONF.import_opt('metadata_port', 'nova.config')
+CONF.import_opt('use_ipv6', 'nova.config')
+CONF.import_opt('my_ip', 'nova.config')
+CONF.import_opt('state_path', 'nova.config')
 
 
 # NOTE(vish): Iptables supports chain names of up to 28 characters,  and we
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 68ea40c0c..17499cd7d 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -55,7 +55,6 @@ from eventlet import greenpool
 import netaddr
 
 from nova.compute import api as compute_api
-from nova import config
 from nova import context
 from nova import exception
 from nova import ipv6
@@ -163,6 +162,13 @@ network_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(network_opts)
+CONF.import_opt('fake_network', 'nova.config')
+CONF.import_opt('floating_ip_dns_manager', 'nova.config')
+CONF.import_opt('instance_dns_domain', 'nova.config')
+CONF.import_opt('instance_dns_manager', 'nova.config')
+CONF.import_opt('network_driver', 'nova.config')
+CONF.import_opt('use_ipv6', 'nova.config')
+CONF.import_opt('my_ip', 'nova.config')
 
 
 class RPCAllocateFixedIP(object):
diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py
index 451aab394..00186974d 100644
--- a/nova/network/quantumv2/api.py
+++ b/nova/network/quantumv2/api.py
@@ -17,7 +17,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 from nova.compute import api as compute_api
-from nova import config
 from nova.db import base
 from nova import exception
 from nova.network.api import refresh_cache
@@ -53,6 +52,7 @@ quantum_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(quantum_opts)
+CONF.import_opt('node_availability_zone', 'nova.config')
 CONF.import_opt('default_floating_pool', 'nova.network.manager')
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py
index d676175f9..8dd7ca9ae 100644
--- a/nova/network/rpcapi.py
+++ b/nova/network/rpcapi.py
@@ -18,13 +18,13 @@
 Client side of the network RPC API.
 """
 
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import rpc
 from nova.openstack.common.rpc import proxy as rpc_proxy
 
 CONF = cfg.CONF
+CONF.import_opt('network_topic', 'nova.config')
 
 
 class NetworkAPI(rpc_proxy.RpcProxy):
diff --git a/nova/objectstore/s3server.py b/nova/objectstore/s3server.py
index 655a3f4d1..9c816f85b 100644
--- a/nova/objectstore/s3server.py
+++ b/nova/objectstore/s3server.py
@@ -44,7 +44,6 @@ import urllib
 import routes
 import webob
 
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import fileutils
 from nova import utils
@@ -65,6 +64,7 @@ s3_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(s3_opts)
+CONF.import_opt('state_path', 'nova.config')
 
 
 def get_wsgi_server():
diff --git a/nova/scheduler/chance.py b/nova/scheduler/chance.py
index dc517e94e..bc5725acd 100644
--- a/nova/scheduler/chance.py
+++ b/nova/scheduler/chance.py
@@ -23,12 +23,12 @@ Chance (Random) Scheduler implementation
 
 import random
 
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.scheduler import driver
 
 CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 
 
 class ChanceScheduler(driver.Scheduler):
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index 6c6beb5e9..e7c51c477 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -28,7 +28,6 @@ from nova.compute import power_state
 from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova import exception
 from nova import notifications
@@ -54,8 +53,7 @@ scheduler_driver_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(scheduler_driver_opts)
-
-CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 CONF.import_opt('instances_path', 'nova.compute.manager')
 CONF.import_opt('libvirt_type', 'nova.virt.libvirt.driver')
 
diff --git a/nova/scheduler/filters/isolated_hosts_filter.py b/nova/scheduler/filters/isolated_hosts_filter.py
index 607c240e5..b2b97b3a7 100644
--- a/nova/scheduler/filters/isolated_hosts_filter.py
+++ b/nova/scheduler/filters/isolated_hosts_filter.py
@@ -13,11 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova.openstack.common import cfg
 from nova.scheduler import filters
 
 CONF = cfg.CONF
+CONF.import_opt('isolated_hosts', 'nova.config')
+CONF.import_opt('isolated_images', 'nova.config')
 
 
 class IsolatedHostsFilter(filters.BaseHostFilter):
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py
index 5ddc65c59..1c5db939b 100644
--- a/nova/scheduler/rpcapi.py
+++ b/nova/scheduler/rpcapi.py
@@ -18,12 +18,12 @@
 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 = cfg.CONF
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 
 class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
diff --git a/nova/service.py b/nova/service.py
index 5657bdd7e..9474ec164 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -30,7 +30,6 @@ import time
 import eventlet
 import greenlet
 
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -92,6 +91,8 @@ service_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(service_opts)
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('node_availability_zone', 'nova.config')
 
 
 class SignalExit(SystemExit):
@@ -477,8 +478,10 @@ class Service(object):
         if not topic:
             topic = binary.rpartition('nova-')[2]
         if not manager:
-            manager = CONF.get('%s_manager' %
-                                binary.rpartition('nova-')[2], None)
+            manager_cls = ('%s_manager' %
+                           binary.rpartition('nova-')[2])
+            CONF.import_opt(manager_cls, 'nova.config')
+            manager = CONF.get(manager_cls, None)
         if report_interval is None:
             report_interval = CONF.report_interval
         if periodic_interval is None:
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 852fbddf1..d7edb7cf6 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -31,7 +31,6 @@ setattr(__builtin__, '_', lambda x: x)
 import os
 import shutil
 
-from nova import config
 from nova.db.sqlalchemy.session import get_engine
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -42,6 +41,9 @@ import eventlet
 eventlet.monkey_patch(os=False)
 
 CONF = cfg.CONF
+CONF.import_opt('sql_connection', 'nova.config')
+CONF.import_opt('sqlite_db', 'nova.config')
+CONF.import_opt('state_path', 'nova.config')
 CONF.set_override('use_stderr', False)
 
 logging.setup('nova')
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py
index f4355a5f0..da5bfa762 100644
--- a/nova/tests/api/ec2/test_cinder_cloud.py
+++ b/nova/tests/api/ec2/test_cinder_cloud.py
@@ -24,7 +24,6 @@ from nova.api.ec2 import cloud
 from nova.api.ec2 import ec2utils
 from nova.compute import api as compute_api
 from nova.compute import utils as compute_utils
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -38,6 +37,8 @@ from nova.tests import matchers
 from nova import volume
 
 CONF = cfg.CONF
+CONF.import_opt('default_instance_type', 'nova.config')
+CONF.import_opt('use_ipv6', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 54437e93e..fdd8fc90d 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -32,7 +32,6 @@ from nova.compute import api as compute_api
 from nova.compute import power_state
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -50,6 +49,9 @@ from nova.virt import fake as fake_virt
 from nova import volume
 
 CONF = cfg.CONF
+CONF.import_opt('default_image', 'nova.config')
+CONF.import_opt('default_instance_type', 'nova.config')
+CONF.import_opt('use_ipv6', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
index 368ede41c..5f92d521e 100644
--- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
+++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
@@ -18,7 +18,6 @@ from lxml import etree
 from nova.api.openstack.compute.contrib import cloudpipe
 from nova.api.openstack import wsgi
 from nova.compute import utils as compute_utils
-from nova import config
 from nova import db
 from nova.openstack.common import cfg
 from nova.openstack.common import timeutils
@@ -29,6 +28,7 @@ from nova.tests import matchers
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('vpn_image_id', 'nova.config')
 
 
 def fake_vpn_instance():
diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/api/openstack/compute/contrib/test_rescue.py
index 7aeb9465e..0d735d5ec 100644
--- a/nova/tests/api/openstack/compute/contrib/test_rescue.py
+++ b/nova/tests/api/openstack/compute/contrib/test_rescue.py
@@ -15,7 +15,6 @@
 import webob
 
 from nova import compute
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -23,6 +22,7 @@ from nova import test
 from nova.tests.api.openstack import fakes
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 
 
 def rescue(self, context, instance, rescue_password=None):
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index 85ab411a5..17ac244ff 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -21,7 +21,6 @@ import webob
 from nova.api.openstack.compute.contrib import volumes
 from nova.compute import api as compute_api
 from nova.compute import instance_types
-from nova import config
 from nova import context
 from nova import db
 from nova.openstack.common import cfg
@@ -33,6 +32,7 @@ from nova.volume import cinder
 from webob import exc
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
 FAKE_UUID_A = '00000000-aaaa-aaaa-aaaa-000000000000'
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index 1d0bfcd1a..e71833916 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -25,7 +25,6 @@ from nova.api.openstack.compute import extensions as compute_extensions
 from nova.api.openstack import extensions as base_extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova import test
@@ -33,6 +32,7 @@ from nova.tests.api.openstack import fakes
 from nova.tests import matchers
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension', 'nova.config')
 
 NS = "{http://docs.openstack.org/common/api/v1.0}"
 ATOMNS = "{http://www.w3.org/2005/Atom}"
diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py
index 204979da1..dbb854c58 100644
--- a/nova/tests/api/openstack/compute/test_server_actions.py
+++ b/nova/tests/api/openstack/compute/test_server_actions.py
@@ -23,7 +23,6 @@ from nova.api.openstack.compute import servers
 from nova.compute import api as compute_api
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova import exception
 from nova.image import glance
@@ -36,6 +35,7 @@ from nova.tests import matchers
 
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 FAKE_UUID = fakes.FAKE_UUID
 INSTANCE_IDS = {FAKE_UUID: 1}
 
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 3ac10c968..79a7e8cd7 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -35,7 +35,6 @@ from nova.compute import api as compute_api
 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.db.sqlalchemy import models
@@ -53,6 +52,8 @@ from nova.tests import matchers
 
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 FAKE_UUID = fakes.FAKE_UUID
 NS = "{http://docs.openstack.org/compute/api/v1.1}"
diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py
index 820fe46e4..8db8a0f6c 100644
--- a/nova/tests/cert/test_rpcapi.py
+++ b/nova/tests/cert/test_rpcapi.py
@@ -19,13 +19,13 @@ Unit Tests for nova.cert.rpcapi
 """
 
 from nova.cert import rpcapi as cert_rpcapi
-from nova import config
 from nova import context
 from nova.openstack.common import cfg
 from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('cert_topic', 'nova.config')
 
 
 class CertRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 368bdcbda..1a31f12ad 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -37,7 +37,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -70,6 +69,9 @@ from nova.volume import cinder
 QUOTAS = quota.QUOTAS
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_topic', 'nova.config')
+CONF.import_opt('host', 'nova.config')
 CONF.import_opt('live_migration_retry_count', 'nova.compute.manager')
 
 
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index ee78ba62f..a85b4fa8a 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -21,7 +21,6 @@ import string
 
 from nova.compute import instance_types
 from nova.compute import utils as compute_utils
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -38,6 +37,7 @@ from nova import utils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
 
 
 class ComputeValidateDeviceTestCase(test.TestCase):
diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/compute/test_multiple_nodes.py
index 0b6b05cf1..9ff0c993c 100644
--- a/nova/tests/compute/test_multiple_nodes.py
+++ b/nova/tests/compute/test_multiple_nodes.py
@@ -18,7 +18,6 @@
 
 import mox
 
-from nova import config
 from nova import context
 from nova import exception
 from nova.openstack.common import cfg
@@ -28,6 +27,7 @@ from nova.virt import fake
 
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
 
 
 class BaseTestCase(test.TestCase):
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index cba206f9e..6af92044b 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -19,7 +19,6 @@ Unit Tests for nova.compute.rpcapi
 """
 
 from nova.compute import rpcapi as compute_rpcapi
-from nova import config
 from nova import context
 from nova import db
 from nova.openstack.common import cfg
@@ -28,6 +27,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 
 
 class ComputeRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py
index d8fd9be1e..9094b8154 100644
--- a/nova/tests/console/test_console.py
+++ b/nova/tests/console/test_console.py
@@ -18,7 +18,6 @@
 
 """Tests For Console proxy."""
 
-from nova import config
 from nova.console import api as console_api
 from nova.console import rpcapi as console_rpcapi
 from nova import context
@@ -30,6 +29,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('console_manager', 'nova.config')
 CONF.import_opt('console_driver', 'nova.console.manager')
 
 
diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py
index e98aee32f..ef4bc4ae7 100644
--- a/nova/tests/console/test_rpcapi.py
+++ b/nova/tests/console/test_rpcapi.py
@@ -18,7 +18,6 @@
 Unit Tests for nova.console.rpcapi
 """
 
-from nova import config
 from nova.console import rpcapi as console_rpcapi
 from nova import context
 from nova.openstack.common import cfg
@@ -26,6 +25,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('console_topic', 'nova.config')
 
 
 class ConsoleRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index e6ef3f7de..c4c17e01a 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -16,10 +16,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova.openstack.common import cfg
 
 CONF = cfg.CONF
+CONF.import_opt('state_path', 'nova.config')
 
 CONF.import_opt('scheduler_driver', 'nova.scheduler.manager')
 CONF.import_opt('fake_network', 'nova.network.manager')
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py
index abbd0be79..fc8e4c249 100644
--- a/nova/tests/fake_network.py
+++ b/nova/tests/fake_network.py
@@ -17,7 +17,6 @@
 
 from nova.compute import api as compute_api
 from nova.compute import manager as compute_manager
-from nova import config
 import nova.context
 from nova import db
 from nova import exception
@@ -32,6 +31,7 @@ from nova.virt.libvirt import config as libvirt_config
 
 HOST = "testhost"
 CONF = cfg.CONF
+CONF.import_opt('use_ipv6', 'nova.config')
 
 
 class FakeIptablesFirewallDriver(object):
diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py
index d495ee2fb..20da3a883 100644
--- a/nova/tests/image/fake.py
+++ b/nova/tests/image/fake.py
@@ -22,7 +22,6 @@ import copy
 import datetime
 import uuid
 
-from nova import config
 from nova import exception
 import nova.image.glance
 from nova.openstack.common import cfg
@@ -30,6 +29,7 @@ from nova.openstack.common import log as logging
 
 
 CONF = cfg.CONF
+CONF.import_opt('null_kernel', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index b8dbdb99d..e8d01299a 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -24,7 +24,6 @@ from lxml import etree
 
 from nova.cloudpipe.pipelib import CloudPipe
 from nova.compute import api
-from nova import config
 from nova import context
 from nova import db
 from nova.network.manager import NetworkManager
@@ -40,6 +39,9 @@ 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('osapi_compute_extension', 'nova.config')
+CONF.import_opt('vpn_image_id', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py
index 24ac1750e..61e4e32d0 100644
--- a/nova/tests/integrated/test_extensions.py
+++ b/nova/tests/integrated/test_extensions.py
@@ -15,12 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common.log import logging
 from nova.tests.integrated import integrated_helpers
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py
index 6ebf92f19..0c4057472 100644
--- a/nova/tests/network/test_linux_net.py
+++ b/nova/tests/network/test_linux_net.py
@@ -19,7 +19,6 @@ import os
 
 import mox
 
-from nova import config
 from nova import context
 from nova import db
 from nova.network import linux_net
@@ -31,6 +30,7 @@ from nova import test
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('network_driver', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 HOST = "testhost"
diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py
index 250dd9d65..760db7ecb 100644
--- a/nova/tests/network/test_rpcapi.py
+++ b/nova/tests/network/test_rpcapi.py
@@ -18,7 +18,6 @@
 Unit Tests for nova.network.rpcapi
 """
 
-from nova import config
 from nova import context
 from nova.network import rpcapi as network_rpcapi
 from nova.openstack.common import cfg
@@ -26,6 +25,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('network_topic', 'nova.config')
 
 
 class NetworkRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index a052757e8..a5a0ddd46 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -18,7 +18,6 @@ Tests For Scheduler Host Filters.
 import httplib
 import stubout
 
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -32,6 +31,7 @@ from nova.tests.scheduler import fakes
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('my_ip', 'nova.config')
 DATA = ''
 
 
diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index bb6465d3c..112a41105 100644
--- a/nova/tests/scheduler/test_rpcapi.py
+++ b/nova/tests/scheduler/test_rpcapi.py
@@ -18,7 +18,6 @@
 Unit Tests for nova.scheduler.rpcapi
 """
 
-from nova import config
 from nova import context
 from nova.openstack.common import cfg
 from nova.openstack.common import rpc
@@ -26,6 +25,7 @@ from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 
 class SchedulerRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index 3ea99d53b..72c58104a 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -27,7 +27,6 @@ from nova import test
 
 from nova.compute import manager as compute_manager
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
@@ -37,6 +36,8 @@ from nova.virt.libvirt import imagecache
 from nova.virt.libvirt import utils as virtutils
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('host', 'nova.config')
 
 LOG = log.getLogger(__name__)
 
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 1b65afc2a..3f0cb8713 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -33,7 +33,6 @@ from nova.compute import instance_types
 from nova.compute import power_state
 from nova.compute import vm_mode
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -71,6 +70,9 @@ libvirt_driver.libvirt = libvirt
 
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('my_ip', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 _fake_network_info = fake_network.fake_get_instance_nw_info
diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index 55490e860..ae23c30b2 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -28,13 +28,14 @@ import tempfile
 from boto import exception as boto_exception
 from boto.s3 import connection as s3
 
-from nova import config
 from nova.objectstore import s3server
 from nova.openstack.common import cfg
 from nova import test
 from nova import wsgi
 
 CONF = cfg.CONF
+CONF.import_opt('s3_host', 'nova.config')
+CONF.import_opt('s3_port', 'nova.config')
 
 # Create a unique temporary directory. We don't delete after test to
 # allow checking the contents after running tests. Users and/or tools
diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py
index b52f0d698..b38b2238e 100644
--- a/nova/tests/test_pipelib.py
+++ b/nova/tests/test_pipelib.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 from nova.cloudpipe import pipelib
-from nova import config
 from nova import context
 from nova import crypto
 from nova.openstack.common import cfg
@@ -22,6 +21,7 @@ from nova import test
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('vpn_key_suffix', 'nova.config')
 
 
 class PipelibTest(test.TestCase):
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 0949239ab..b29ef59d4 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -20,7 +20,6 @@ import datetime
 
 from nova import compute
 from nova.compute import instance_types
-from nova import config
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import api as sqa_api
@@ -35,6 +34,7 @@ from nova import test
 import nova.tests.image.fake
 
 CONF = cfg.CONF
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 
 class QuotaIntegrationTestCase(test.TestCase):
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 82de6114b..b0f3e9fac 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -27,7 +27,6 @@ from eventlet import greenpool
 import mox
 
 import nova
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import timeutils
@@ -35,6 +34,7 @@ from nova import test
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('glance_port', 'nova.config')
 
 
 class ByteConversionTest(test.TestCase):
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index bc3c1dd38..5253d6292 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -29,7 +29,6 @@ from nova.compute import instance_types
 from nova.compute import power_state
 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
@@ -58,6 +57,10 @@ from nova.virt.xenapi import volume_utils
 LOG = logging.getLogger(__name__)
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('network_manager', 'nova.config')
+CONF.import_opt('node_availability_zone', 'nova.config')
 
 IMAGE_MACHINE = '1'
 IMAGE_KERNEL = '2'
diff --git a/nova/tests/utils.py b/nova/tests/utils.py
index 9d5eb3144..f88135e3c 100644
--- a/nova/tests/utils.py
+++ b/nova/tests/utils.py
@@ -22,6 +22,7 @@ from nova.image import glance
 from nova.openstack.common import cfg
 
 CONF = cfg.CONF
+CONF.import_opt('use_ipv6', 'nova.config')
 
 
 def get_test_admin_context():
diff --git a/nova/utils.py b/nova/utils.py
index a872a6c26..464629d95 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -46,7 +46,6 @@ from eventlet import greenthread
 from eventlet import semaphore
 import netaddr
 
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
@@ -60,6 +59,11 @@ CONF = cfg.CONF
 CONF.register_opt(
     cfg.BoolOpt('disable_process_locking', default=False,
                 help='Whether to disable inter-process locks'))
+CONF.import_opt('glance_port', 'nova.config')
+CONF.import_opt('instance_usage_audit_period', 'nova.config')
+CONF.import_opt('monkey_patch', 'nova.config')
+CONF.import_opt('rootwrap_config', 'nova.config')
+CONF.import_opt('service_down_time', 'nova.config')
 
 # Used for looking up extensions of text
 # to their 'multiplied' byte amount
diff --git a/nova/virt/baremetal/db/sqlalchemy/session.py b/nova/virt/baremetal/db/sqlalchemy/session.py
index 0fc71562b..b500433a4 100644
--- a/nova/virt/baremetal/db/sqlalchemy/session.py
+++ b/nova/virt/baremetal/db/sqlalchemy/session.py
@@ -19,7 +19,6 @@
 
 """Session Handling for SQLAlchemy backend."""
 
-from nova import config
 from nova.db.sqlalchemy import session as nova_session
 from nova.openstack.common import cfg
 
@@ -32,6 +31,7 @@ opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(opts)
+CONF.import_opt('sqlite_db', 'nova.config')
 
 _ENGINE = None
 _MAKER = None
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index e8d9308a3..443bd7b05 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -32,7 +32,6 @@ import tempfile
 if os.name != 'nt':
     import crypt
 
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -78,6 +77,7 @@ disk_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(disk_opts)
+CONF.import_opt('pybasedir', 'nova.config')
 
 _MKFS_COMMAND = {}
 _DEFAULT_MKFS_COMMAND = None
diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py
index d45fbbde1..11a8ea2bf 100644
--- a/nova/virt/firewall.py
+++ b/nova/virt/firewall.py
@@ -17,7 +17,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova import context
 from nova import network
 from nova.network import linux_net
@@ -42,6 +41,7 @@ firewall_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(firewall_opts)
+CONF.import_opt('use_ipv6', 'nova.config')
 
 
 def load_driver(default, *args, **kwargs):
diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py
index 2ecddec76..de98dd8b2 100644
--- a/nova/virt/hyperv/livemigrationops.py
+++ b/nova/virt/hyperv/livemigrationops.py
@@ -21,7 +21,6 @@ Management class for live migration VM operations.
 import os
 import sys
 
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
@@ -36,6 +35,7 @@ if sys.platform == 'win32':
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('use_cow_images', 'nova.config')
 
 
 class LiveMigrationOps(baseops.BaseOps):
diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py
index 5dfdebb47..e4704798b 100644
--- a/nova/virt/hyperv/vmops.py
+++ b/nova/virt/hyperv/vmops.py
@@ -22,7 +22,6 @@ import os
 import uuid
 
 from nova.api.metadata import base as instance_metadata
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import lockutils
@@ -59,6 +58,7 @@ hyperv_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(hyperv_opts)
+CONF.import_opt('use_cow_images', 'nova.config')
 
 
 class VMOps(baseops.BaseOps):
diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py
index 79d35eae8..821a79018 100644
--- a/nova/virt/hyperv/volumeops.py
+++ b/nova/virt/hyperv/volumeops.py
@@ -21,7 +21,6 @@ Management class for Storage-related functions (attach, detach, etc).
 import time
 
 from nova import block_device
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import driver
@@ -42,6 +41,7 @@ hyper_volumeops_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(hyper_volumeops_opts)
+CONF.import_opt('my_ip', 'nova.config')
 
 
 class VolumeOps(baseops.BaseOps):
diff --git a/nova/virt/hyperv/volumeutils.py b/nova/virt/hyperv/volumeutils.py
index e4368b2f5..91cc6b0a5 100644
--- a/nova/virt/hyperv/volumeutils.py
+++ b/nova/virt/hyperv/volumeutils.py
@@ -25,7 +25,6 @@ import sys
 import time
 
 from nova import block_device
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova.virt import driver
@@ -37,6 +36,7 @@ if sys.platform == 'win32':
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('my_ip', 'nova.config')
 
 
 class VolumeUtils(object):
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 00240913c..865577105 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -59,7 +59,6 @@ from nova.api.metadata import base as instance_metadata
 from nova import block_device
 from nova.compute import power_state
 from nova.compute import vm_mode
-from nova import config
 from nova import context as nova_context
 from nova import exception
 from nova.image import glance
@@ -185,6 +184,10 @@ libvirt_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(libvirt_opts)
+CONF.import_opt('default_ephemeral_format', 'nova.config')
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('my_ip', 'nova.config')
+CONF.import_opt('use_cow_images', 'nova.config')
 CONF.import_opt('live_migration_retry_count', 'nova.compute.manager')
 CONF.import_opt('vncserver_proxyclient_address', 'nova.vnc')
 
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index e7c4ca64f..a818d65d4 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -20,13 +20,14 @@
 
 from eventlet import tpool
 
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 import nova.virt.firewall as base_firewall
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('use_ipv6', 'nova.config')
+CONF.import_opt('vpn_image_id', 'nova.config')
 
 try:
     import libvirt
diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py
index e9e9fef74..865135340 100644
--- a/nova/virt/libvirt/imagecache.py
+++ b/nova/virt/libvirt/imagecache.py
@@ -29,7 +29,6 @@ import time
 
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
 from nova import utils
@@ -57,6 +56,7 @@ imagecache_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(imagecache_opts)
+CONF.import_opt('host', 'nova.config')
 CONF.import_opt('instances_path', 'nova.compute.manager')
 CONF.import_opt('base_dir_name', 'nova.compute.manager')
 
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 51c8dacd7..8e54c3466 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -19,7 +19,6 @@
 
 """VIF drivers for libvirt."""
 
-from nova import config
 from nova import exception
 from nova.network import linux_net
 from nova.openstack.common import cfg
@@ -44,6 +43,7 @@ libvirt_vif_opts = [
 CONF = cfg.CONF
 CONF.register_opts(libvirt_vif_opts)
 CONF.import_opt('libvirt_type', 'nova.virt.libvirt.driver')
+CONF.import_opt('use_ipv6', 'nova.config')
 
 LINUX_DEV_LEN = 14
 
diff --git a/nova/virt/libvirt/volume_nfs.py b/nova/virt/libvirt/volume_nfs.py
index 42ea880ac..722760f0a 100644
--- a/nova/virt/libvirt/volume_nfs.py
+++ b/nova/virt/libvirt/volume_nfs.py
@@ -20,7 +20,6 @@
 import ctypes
 import os
 
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -36,6 +35,7 @@ volume_opts = [
 ]
 CONF = cfg.CONF
 CONF.register_opts(volume_opts)
+CONF.import_opt('state_path', 'nova.config')
 
 
 class NfsVolumeDriver(volume.LibvirtVolumeDriver):
diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py
index a28e6f19f..3196271a4 100644
--- a/nova/virt/netutils.py
+++ b/nova/virt/netutils.py
@@ -23,10 +23,10 @@
 
 import netaddr
 
-from nova import config
 from nova.openstack.common import cfg
 
 CONF = cfg.CONF
+CONF.import_opt('use_ipv6', 'nova.config')
 CONF.import_opt('injected_network_template', 'nova.virt.disk.api')
 
 Template = None
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py
index f25dd82bd..8840a561e 100644
--- a/nova/virt/xenapi/driver.py
+++ b/nova/virt/xenapi/driver.py
@@ -46,7 +46,6 @@ import xmlrpclib
 from eventlet import queue
 from eventlet import timeout
 
-from nova import config
 from nova import context
 from nova import exception
 from nova.openstack.common import cfg
@@ -119,6 +118,7 @@ xenapi_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(xenapi_opts)
+CONF.import_opt('host', 'nova.config')
 
 
 class XenAPIDriver(driver.ComputeDriver):
diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py
index 064dcd48e..a1f707dbb 100644
--- a/nova/virt/xenapi/pool.py
+++ b/nova/virt/xenapi/pool.py
@@ -22,7 +22,6 @@ Management class for Pool-related functions (join, eject, etc).
 import urlparse
 
 from nova.compute import rpcapi as compute_rpcapi
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -41,6 +40,7 @@ xenapi_pool_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(xenapi_pool_opts)
+CONF.import_opt('host', 'nova.config')
 
 
 class ResourcePool(object):
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 2fc668e8f..a9d11ac49 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -37,7 +37,6 @@ from eventlet import greenthread
 from nova import block_device
 from nova.compute import instance_types
 from nova.compute import power_state
-from nova import config
 from nova import exception
 from nova.image import glance
 from nova.openstack.common import cfg
@@ -117,6 +116,11 @@ xenapi_vm_utils_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(xenapi_vm_utils_opts)
+CONF.import_opt('cache_images', 'nova.config')
+CONF.import_opt('default_ephemeral_format', 'nova.config')
+CONF.import_opt('glance_num_retries', 'nova.config')
+CONF.import_opt('use_cow_images', 'nova.config')
+CONF.import_opt('use_ipv6', 'nova.config')
 
 XENAPI_POWER_STATE = {
     'Halted': power_state.SHUTDOWN,
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 5186a3bb2..4915804a9 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -30,7 +30,6 @@ from nova.compute import api as compute
 from nova.compute import power_state
 from nova.compute import vm_mode
 from nova.compute import vm_states
-from nova import config
 from nova import context as nova_context
 from nova import exception
 from nova.openstack.common import cfg
@@ -61,6 +60,7 @@ xenapi_vmops_opts = [
 
 CONF = cfg.CONF
 CONF.register_opts(xenapi_vmops_opts)
+CONF.import_opt('host', 'nova.config')
 CONF.import_opt('vncserver_proxyclient_address', 'nova.vnc')
 
 DEFAULT_FIREWALL_DRIVER = "%s.%s" % (
diff --git a/nova/wsgi.py b/nova/wsgi.py
index 304a8d668..19dcd2d60 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -30,7 +30,6 @@ import routes.middleware
 import webob.dec
 import webob.exc
 
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -46,6 +45,7 @@ wsgi_opts = [
     ]
 CONF = cfg.CONF
 CONF.register_opts(wsgi_opts)
+CONF.import_opt('api_paste_config', 'nova.config')
 
 LOG = logging.getLogger(__name__)