11 files changed, 13 insertions, 15 deletions
diff --git a/nova/network/__init__.py b/nova/network/__init__.py
index 79955e1eb4..6ca684f49c 100644
--- a/nova/network/__init__.py
+++ b/nova/network/__init__.py
@@ -18,11 +18,12 @@
 
 # Importing full names to not pollute the namespace and cause possible
 # collisions with use of 'from nova.network import <foo>' elsewhere.
-import nova.config
+import nova.openstack.common.cfg
 import nova.openstack.common.importutils
 
 
 def API():
     importutils = nova.openstack.common.importutils
-    cls = importutils.import_class(nova.config.CONF.network_api_class)
+    network_api_class = nova.openstack.common.cfg.CONF.network_api_class
+    cls = importutils.import_class(network_api_class)
     return cls()
diff --git a/nova/network/api.py b/nova/network/api.py
index 049b8c7c0a..2c0ddb05f6 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -20,7 +20,6 @@
 import functools
 import inspect
 
-from nova import config
 from nova.db import base
 from nova import exception
 from nova.network import model as network_model
diff --git a/nova/network/l3.py b/nova/network/l3.py
index e937245e77..bea1c3e6af 100644
--- a/nova/network/l3.py
+++ b/nova/network/l3.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova.network import linux_net
 from nova.openstack.common import log as logging
 from nova import utils
diff --git a/nova/network/ldapdns.py b/nova/network/ldapdns.py
index 15b6ca235b..0cc07aa922 100644
--- a/nova/network/ldapdns.py
+++ b/nova/network/ldapdns.py
@@ -15,13 +15,12 @@
 import ldap
 import time
 
-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__)
 
 ldap_dns_opts = [
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 047c11d34d..158d564639 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -87,7 +87,7 @@ linux_net_opts = [
                      'get default gateway from dhcp server'),
     ]
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(linux_net_opts)
 
 
diff --git a/nova/network/manager.py b/nova/network/manager.py
index f54764d8fd..68ea40c0c8 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -161,7 +161,7 @@ network_opts = [
                help="Indicates underlying L3 management library")
     ]
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(network_opts)
 
 
diff --git a/nova/network/minidns.py b/nova/network/minidns.py
index 37b85fb66c..a4a945c15a 100644
--- a/nova/network/minidns.py
+++ b/nova/network/minidns.py
@@ -16,10 +16,10 @@ import os
 import shutil
 import tempfile
 
-from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 
-CONF = config.CONF
+CONF = cfg.CONF
 
 
 class MiniDNS(object):
diff --git a/nova/network/quantum/nova_ipam_lib.py b/nova/network/quantum/nova_ipam_lib.py
index 4e6f5dbed3..5c2adf7f1b 100644
--- a/nova/network/quantum/nova_ipam_lib.py
+++ b/nova/network/quantum/nova_ipam_lib.py
@@ -17,7 +17,6 @@
 
 import netaddr
 
-from nova import config
 from nova import db
 from nova import exception
 from nova import ipv6
diff --git a/nova/network/quantumv2/__init__.py b/nova/network/quantumv2/__init__.py
index 3377a32ab3..151bd6afad 100644
--- a/nova/network/quantumv2/__init__.py
+++ b/nova/network/quantumv2/__init__.py
@@ -15,14 +15,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova import exception
+from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from quantumclient import client
 from quantumclient.v2_0 import client as clientv20
 
-CONF = config.CONF
+CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py
index 38692351e2..451aab394e 100644
--- a/nova/network/quantumv2/api.py
+++ b/nova/network/quantumv2/api.py
@@ -51,7 +51,7 @@ quantum_opts = [
                     'quantum in admin context'),
     ]
 
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_opts(quantum_opts)
 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 c0742b1ca0..d676175f97 100644
--- a/nova/network/rpcapi.py
+++ b/nova/network/rpcapi.py
@@ -19,11 +19,12 @@ 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 = config.CONF
+CONF = cfg.CONF
 
 
 class NetworkAPI(rpc_proxy.RpcProxy):