summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-24 07:22:06 +0000
committerGerrit Code Review <review@openstack.org>2012-01-24 07:22:06 +0000
commit0fc18408d93aa30a2cb2650951dc1171b4ef6bcd (patch)
tree76b9ad4836a95a7325a06c8332fed5e26a26843e
parent7d9d2ec38747e6683ec97cd7c1af2e98eb82ea56 (diff)
parent2a43fbd0e5017b281d9986312775b4ea6aa2f294 (diff)
downloadnova-0fc18408d93aa30a2cb2650951dc1171b4ef6bcd.tar.gz
nova-0fc18408d93aa30a2cb2650951dc1171b4ef6bcd.tar.xz
nova-0fc18408d93aa30a2cb2650951dc1171b4ef6bcd.zip
Merge "Add floating IP support to Quantum Manager"
-rw-r--r--nova/network/quantum/manager.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py
index 4e3459011..933837b8b 100644
--- a/nova/network/quantum/manager.py
+++ b/nova/network/quantum/manager.py
@@ -52,7 +52,7 @@ flags.DEFINE_bool('quantum_use_port_security', False,
'Whether or not to enable port security')
-class QuantumManager(manager.FlatManager):
+class QuantumManager(manager.FloatingIP, manager.FlatManager):
"""NetworkManager class that communicates with a Quantum service
via a web services API to provision VM network connectivity.
@@ -90,6 +90,10 @@ class QuantumManager(manager.FlatManager):
# Initialize forwarding rules for anything specified in
# FLAGS.fixed_range()
self.driver.init_host()
+ # Initialize floating ip support (only works for nova ipam currently)
+ if FLAGS.quantum_ipam_lib == 'nova.network.quantum.nova_ipam_lib':
+ LOG.debug("Initializing FloatingIP support")
+ self.init_host_floating_ips()
# Set up all the forwarding rules for any network that has a
# gateway set.
networks = self.get_all_networks()