From 09cc03b31b73c91c9a3888d57d6898a57df6ecc6 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Sat, 17 Nov 2012 22:50:21 +0000
Subject: [PATCH] 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
---
 bin/nova-all                        | 1 +
 bin/nova-api                        | 1 +
 bin/nova-cert                       | 1 +
 bin/nova-compute                    | 1 +
 bin/nova-console                    | 1 +
 bin/nova-dhcpbridge                 | 2 ++
 bin/nova-manage                     | 2 ++
 bin/nova-network                    | 1 +
 bin/nova-scheduler                  | 1 +
 nova/scheduler/rpcapi.py            | 2 +-
 nova/tests/fake_flags.py            | 2 +-
 nova/tests/scheduler/test_rpcapi.py | 2 +-
 nova/tests/test_imagecache.py       | 3 ++-
 nova/tests/test_libvirt.py          | 4 +++-
 nova/tests/test_xenapi.py           | 5 ++++-
 15 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/bin/nova-all b/bin/nova-all
index 42c8ffbf..88b92a4c 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -50,6 +50,7 @@ from nova.vnc import xvp_proxy
 
 
 CONF = cfg.CONF
+CONF.import_opt('enabled_apis', 'nova.config')
 LOG = logging.getLogger('nova.all')
 
 if __name__ == '__main__':
diff --git a/bin/nova-api b/bin/nova-api
index 6d3304a9..ceb7ca49 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -43,6 +43,7 @@ from nova import service
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('enabled_apis', 'nova.config')
 
 if __name__ == '__main__':
     config.parse_args(sys.argv)
diff --git a/bin/nova-cert b/bin/nova-cert
index 68d22305..8488d09e 100755
--- a/bin/nova-cert
+++ b/bin/nova-cert
@@ -39,6 +39,7 @@ from nova import service
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('cert_topic', 'nova.config')
 
 if __name__ == '__main__':
     config.parse_args(sys.argv)
diff --git a/bin/nova-compute b/bin/nova-compute
index c0064142..bdc95dd3 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -48,6 +48,7 @@ from nova import service
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 
 if __name__ == '__main__':
     config.parse_args(sys.argv)
diff --git a/bin/nova-console b/bin/nova-console
index 6b5b8434..80bd443e 100755
--- a/bin/nova-console
+++ b/bin/nova-console
@@ -39,6 +39,7 @@ from nova.openstack.common import log as logging
 from nova import service
 
 CONF = cfg.CONF
+CONF.import_opt('console_topic', 'nova.config')
 
 if __name__ == '__main__':
     config.parse_args(sys.argv)
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index b1081937..b3370e6e 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -47,6 +47,8 @@ from nova.openstack.common import rpc
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('network_manager', 'nova.config')
 LOG = logging.getLogger('nova.dhcpbridge')
 
 
diff --git a/bin/nova-manage b/bin/nova-manage
index 565c22a1..23a76c5d 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -89,6 +89,8 @@ from nova import utils
 from nova import version
 
 CONF = cfg.CONF
+CONF.import_opt('network_manager', 'nova.config')
+CONF.import_opt('service_down_time', 'nova.config')
 CONF.import_opt('flat_network_bridge', 'nova.network.manager')
 CONF.import_opt('num_networks', 'nova.network.manager')
 CONF.import_opt('multi_host', 'nova.network.manager')
diff --git a/bin/nova-network b/bin/nova-network
index 7682b8d0..2a7ce1ff 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -41,6 +41,7 @@ from nova import service
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('network_topic', 'nova.config')
 
 if __name__ == '__main__':
     config.parse_args(sys.argv)
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index e623b5fc..e157eef6 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -43,6 +43,7 @@ from nova import service
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 if __name__ == '__main__':
     config.parse_args(sys.argv)
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py
index 5ddc65c5..1c5db939 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/tests/fake_flags.py b/nova/tests/fake_flags.py
index e6ef3f7d..c4c17e01 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/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index bb6465d3..112a4110 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 3ea99d53..72c58104 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 1b65afc2..3f0cb871 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_xenapi.py b/nova/tests/test_xenapi.py
index bc3c1dd3..5253d629 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'