diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-28 17:02:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-28 17:02:51 +0000 |
| commit | 18bc8abd031f294c69941bd0401738b664f14bf0 (patch) | |
| tree | b016d7debf1b6a7790bbfa0e817c2b1ae7e26637 /nova/cloudpipe | |
| parent | 82cb8600534e8cf84f2c2ad9bb8d948f04e81b4c (diff) | |
| parent | 4408b6bb43353624b525ff674f5aaad46efc8438 (diff) | |
Merge "Move ec2 config opts to nova.api.ec2.cloud"
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 274bdf5b5..8b8ae00c6 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') |