Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Set 'dhcp_server' in _teardown_network_on_host.
Update _teardown_network_on_host so that it sets 'dhcp_server'
on network objects for compatability when using flat dhcp with
linux_net.

Fixes LP bug #951642. ('Network' object has no attribute 'dhcp_server')

Change-Id: I53ab99155ea6e4163c9eb0b28b765f962f99a2b1
  • Loading branch information
dprince committed Mar 10, 2012
1 parent 7322c59 commit a44f4c7
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions nova/network/manager.py
Expand Up @@ -1676,6 +1676,7 @@ def _setup_network_on_host(self, context, network):

def _teardown_network_on_host(self, context, network):
if not FLAGS.fake_network:
network['dhcp_server'] = self._get_dhcp_ip(context, network)
dev = self.driver.get_dev(network)
self.driver.update_dhcp(context, dev, network)

Expand Down Expand Up @@ -1824,6 +1825,7 @@ def _setup_network_on_host(self, context, network):

def _teardown_network_on_host(self, context, network):
if not FLAGS.fake_network:
network['dhcp_server'] = self._get_dhcp_ip(context, network)
dev = self.driver.get_dev(network)
self.driver.update_dhcp(context, dev, network)

Expand Down

0 comments on commit a44f4c7

Please sign in to comment.