From e237c86446ba4ecba95cf65a2609733707aab68e Mon Sep 17 00:00:00 2001 From: Mark McLoughlin 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/cloudpipe/pipelib.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nova/cloudpipe') diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 5fa8dd702..274bdf5b5 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -28,7 +28,6 @@ import zipfile from nova import compute from nova.compute import instance_types -from nova import config from nova import crypto from nova import db from nova import exception @@ -55,6 +54,11 @@ cloudpipe_opts = [ CONF = cfg.CONF CONF.register_opts(cloudpipe_opts) +CONF.import_opt('ec2_dmz_host', 'nova.config') +CONF.import_opt('ec2_port', 'nova.config') +CONF.import_opt('vpn_image_id', 'nova.config') +CONF.import_opt('vpn_key_suffix', 'nova.config') +CONF.import_opt('pybasedir', 'nova.config') CONF.import_opt('cnt_vpn_clients', 'nova.network.manager') LOG = logging.getLogger(__name__) -- cgit