diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-20 19:08:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-20 19:08:16 +0000 |
| commit | 2f14816aa2a55d686f043d18299500190adf98c6 (patch) | |
| tree | 042d15f4a499c6cbc6c357a7fbc2a5907bd69c68 /nova | |
| parent | e79a88e9ff00ee3ca54620210bea8050820fa1ab (diff) | |
| parent | 41dcab9cac2dbad330fb255babdd21925fc9b744 (diff) | |
Merge "Allow Quantum Manager to run in "Flat" mode."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/quantum/manager.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index 687c9d076..cdfb48e77 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -83,6 +83,10 @@ class QuantumManager(manager.FlatManager): super(QuantumManager, self).__init__(*args, **kwargs) def init_host(self): + # Don't call into self.driver (linux_net) unless dhcp is enabled + if not FLAGS.quantum_use_dhcp: + return + # Initialize forwarding rules for anything specified in # FLAGS.fixed_range() self.driver.init_host() @@ -152,7 +156,7 @@ class QuantumManager(manager.FlatManager): cidr_v6, dns1, dns2) # Initialize forwarding if gateway is set - if gateway: + if gateway and FLAGS.quantum_use_dhcp: self.driver.add_snat_rule(cidr) return [{'uuid': quantum_net_id}] @@ -192,8 +196,9 @@ class QuantumManager(manager.FlatManager): self.ipam.delete_subnets_by_net_id(context, quantum_net_id, project_id) # Get rid of dnsmasq - dev = self._generate_gw_dev(quantum_net_id) - self.driver.kill_dhcp(dev) + if FLAGS.quantum_use_dhcp: + dev = self._generate_gw_dev(quantum_net_id) + self.driver.kill_dhcp(dev) def allocate_for_instance(self, context, **kwargs): """Called by compute when it is creating a new VM. |