diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-21 23:29:35 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-28 15:04:34 +0000 |
| commit | 4408b6bb43353624b525ff674f5aaad46efc8438 (patch) | |
| tree | 07669175f28f21339989f29bf9ccb85bf19b63c1 /nova/cloudpipe | |
| parent | 33d7f56cc424071a90f78ebd21913ce2bc9e6c0d (diff) | |
| download | nova-4408b6bb43353624b525ff674f5aaad46efc8438.tar.gz | |
Move ec2 config opts to nova.api.ec2.cloud
Only ec2_dmz_host and ec2_port are used outside of ec2.cloud and in
both cases pipelib is the other module that uses them.
Move all the ec2 options to ec2.cloud and make pipelib explicitly
depend on the ones it needs.
blueprint: scope-config-opts
Change-Id: Ib187ec3421a25bdd86b13dfeae1dc9a07873eb43
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 274bdf5b57..8b8ae00c6c 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -54,8 +54,8 @@ 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('ec2_dmz_host', 'nova.api.ec2.cloud') +CONF.import_opt('ec2_port', 'nova.api.ec2.cloud') CONF.import_opt('vpn_image_id', 'nova.config') CONF.import_opt('vpn_key_suffix', 'nova.config') CONF.import_opt('pybasedir', 'nova.config') |