summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-10 05:36:00 +0000
committerGerrit Code Review <review@openstack.org>2013-01-10 05:36:00 +0000
commit27f49df317a9f8669b71aa58b1f26e0e61d7db5a (patch)
tree8cd1ac1c0d2a41cb2c6539d6f58bc8ac43331687 /nova/api
parent9383329eb664b969ed367b8aa7f78e3ef0ad72dd (diff)
parent7cb17d63f1bd317abc5cacd6d77e7ca810ccc346 (diff)
Merge "Move global service networking opts to new module"
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 5dd861e8d..73a4a02ae 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -71,7 +71,7 @@ ec2_opts = [
CONF = cfg.CONF
CONF.register_opts(ec2_opts)
-CONF.import_opt('my_ip', 'nova.config')
+CONF.import_opt('my_ip', 'nova.netconf')
CONF.import_opt('vpn_key_suffix', 'nova.cloudpipe.pipelib')
CONF.import_opt('internal_service_availability_zone',
'nova.availability_zones')