From a44f4c779f4c8beda98075cdb63582a15613a808 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Sat, 10 Mar 2012 12:14:53 -0500 Subject: 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 --- nova/network/manager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nova/network/manager.py b/nova/network/manager.py index 00c3b30e4..41ddf57c5 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1676,6 +1676,7 @@ class FlatDHCPManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): 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) @@ -1824,6 +1825,7 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): 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) -- cgit