summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2013-01-30 11:18:58 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2013-01-31 15:38:17 -0800
commitdd5f2c82d7d23a3bac3aabaa8cc58a10d4b70fcf (patch)
treebdceb1e5e78a47a699a9e7c2665ffdde1817dd42 /nova/api
parent45e92d47038514fc05ae17a8a38dae1b337c15fe (diff)
downloadnova-dd5f2c82d7d23a3bac3aabaa8cc58a10d4b70fcf.tar.gz
nova-dd5f2c82d7d23a3bac3aabaa8cc58a10d4b70fcf.tar.xz
nova-dd5f2c82d7d23a3bac3aabaa8cc58a10d4b70fcf.zip
Split floating ip functionality into new file.
This is to prepare for moving this code into network.api. There was one minor change made to associate_floating_ip. It no longer checks access to the fixed ip's network before associating the floating ip to the fixed ip. The calling side was already verifying access to the instance so this is unnecessary. A note was added to the method call to ensure future usage of associate_floating keeps this in mind. Part of blueprint optimize-nova-network Change-Id: I4fcda82eebee46d167e028bb68c8fedf2c3e03a1
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/floating_ips_bulk.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips_bulk.py b/nova/api/openstack/compute/contrib/floating_ips_bulk.py
index f5b8d24dd..6ba60daf8 100644
--- a/nova/api/openstack/compute/contrib/floating_ips_bulk.py
+++ b/nova/api/openstack/compute/contrib/floating_ips_bulk.py
@@ -25,7 +25,7 @@ from nova.openstack.common import cfg
from nova.openstack.common import log as logging
CONF = cfg.CONF
-CONF.import_opt('default_floating_pool', 'nova.network.manager')
+CONF.import_opt('default_floating_pool', 'nova.network.floating_ips')
CONF.import_opt('public_interface', 'nova.network.linux_net')