Merge "Split floating ip functionality into new file."

openstack · Feb 1, 2013 · c421d77 · c421d77
2 parents 967807f + dd5f2c8
commit c421d77
Show file tree

Hide file tree

Showing 6 changed files with 675 additions and 636 deletions.
diff --git a/bin/nova-manage b/bin/nova-manage
@@ -98,7 +98,7 @@ CONF.import_opt('multi_host', 'nova.network.manager')
 CONF.import_opt('network_size', 'nova.network.manager')
 CONF.import_opt('vlan_start', 'nova.network.manager')
 CONF.import_opt('vpn_start', 'nova.network.manager')
-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')
 
 QUOTAS = quota.QUOTAS

diff --git 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 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')