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
---
 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 +
 9 files changed, 11 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-all b/bin/nova-all
index 42c8ffbff..88b92a4c6 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 6d3304a95..ceb7ca496 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 68d223058..8488d09ea 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 c00641423..bdc95dd34 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 6b5b84343..80bd443ec 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 b1081937f..b3370e6eb 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 565c22a1c..23a76c5d3 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 7682b8d07..2a7ce1ffc 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 e623b5fcf..e157eef6b 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)
-- 
cgit