summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-10 05:35:19 +0000
committerGerrit Code Review <review@openstack.org>2013-01-10 05:35:19 +0000
commit2d061617b2482c9bf26c279bb03178be95482d24 (patch)
tree8e173c20b6be67374fd6d138c8a87b34d5d60f14 /nova/api
parent5a87a506420c31a9490fccc7eac3f02e834ef9bc (diff)
parent780ee742328a476a96e1d5011024902a7e01d33b (diff)
Merge "Move vpn_key_suffix into pipelib"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index ce7095808..5dd861e8d 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -72,7 +72,7 @@ ec2_opts = [
CONF = cfg.CONF
CONF.register_opts(ec2_opts)
CONF.import_opt('my_ip', 'nova.config')
-CONF.import_opt('vpn_key_suffix', 'nova.config')
+CONF.import_opt('vpn_key_suffix', 'nova.cloudpipe.pipelib')
CONF.import_opt('internal_service_availability_zone',
'nova.availability_zones')