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

17 files changed, 25 insertions, 17 deletions

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" % (