diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-17 22:50:21 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-20 00:04:49 +0000 |
| commit | e237c86446ba4ecba95cf65a2609733707aab68e (patch) | |
| tree | e6a7ae4235de5faaf6f0cae383fe126b3cf5dd0b /nova/cloudpipe | |
| parent | 94d87bce212f91c54370784a5544f1a07625938a (diff) | |
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 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 6 |
1 files changed, 5 insertions, 1 deletions
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__) |