summaryrefslogtreecommitdiffstats
path: root/bin/nova-compute
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-11-17 22:50:21 +0000
committerMark McLoughlin <markmc@redhat.com>2012-11-20 00:04:49 +0000
commite237c86446ba4ecba95cf65a2609733707aab68e (patch)
treee6a7ae4235de5faaf6f0cae383fe126b3cf5dd0b /bin/nova-compute
parent94d87bce212f91c54370784a5544f1a07625938a (diff)
downloadnova-e237c86446ba4ecba95cf65a2609733707aab68e.tar.gz
nova-e237c86446ba4ecba95cf65a2609733707aab68e.tar.xz
nova-e237c86446ba4ecba95cf65a2609733707aab68e.zip
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
Diffstat (limited to 'bin/nova-compute')
-rwxr-xr-xbin/nova-compute1
1 files changed, 1 insertions, 0 deletions
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)