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/utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nova/utils.py')

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