summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-01 06:41:00 +0000
committerGerrit Code Review <review@openstack.org>2013-02-01 06:41:00 +0000
commitc421d775ee3052d1af4c08b8ff81f6877ca8b1a8 (patch)
tree31d9048bec98176668063b468ed0f202eb3930ec /nova/api
parent967807f898ec0f6b467045ca3f80feb6967d4177 (diff)
parentdd5f2c82d7d23a3bac3aabaa8cc58a10d4b70fcf (diff)
Merge "Split floating ip functionality into new file."
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 db506a15d..11ab0ec69 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')