From e237c86446ba4ecba95cf65a2609733707aab68e Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Sat, 17 Nov 2012 22:50:21 +0000
Subject: 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
---
 nova/compute/api.py            |  7 ++++++-
 nova/compute/instance_types.py |  2 +-
 nova/compute/manager.py        | 17 ++++++++++++++++-
 nova/compute/rpcapi.py         |  2 +-
 nova/compute/utils.py          |  3 ++-
 5 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'nova/compute')

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