diff options
| author | Dan Prince <dprince@redhat.com> | 2012-03-10 12:14:53 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-03-10 12:14:53 -0500 |
| commit | a44f4c779f4c8beda98075cdb63582a15613a808 (patch) | |
| tree | 101448dd8301bd1afdd8540afa95899cbda55ffa | |
| parent | 7322c59ef45d14c94e171bebc2c9bf13710b25a8 (diff) | |
| download | nova-a44f4c779f4c8beda98075cdb63582a15613a808.tar.gz nova-a44f4c779f4c8beda98075cdb63582a15613a808.tar.xz nova-a44f4c779f4c8beda98075cdb63582a15613a808.zip | |
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
| -rw-r--r-- | nova/network/manager.py | 2 |
1 files changed, 2 insertions, 0 deletions
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) |