diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-07-22 22:39:08 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-07-22 22:39:08 +0000 |
| commit | fc00b24ddd4d2eceb68199b059fb895604ce361d (patch) | |
| tree | a800a80a0229d4585c7c82dfc00376aa67c42d5a | |
| parent | 35deb55f304bc380b2b17aa1caf65001a38ae486 (diff) | |
| download | nova-fc00b24ddd4d2eceb68199b059fb895604ce361d.tar.gz nova-fc00b24ddd4d2eceb68199b059fb895604ce361d.tar.xz nova-fc00b24ddd4d2eceb68199b059fb895604ce361d.zip | |
make sure dhcp_server is available in vlan mode
| -rw-r--r-- | nova/network/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 75c3f668d..3c1d58af3 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -893,7 +893,6 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): def _setup_network(self, context, network_ref): """Sets up network on this host.""" - network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref) if not network_ref['vpn_public_address']: net = {} address = FLAGS.vpn_ip @@ -901,6 +900,7 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): network_ref = db.network_update(context, network_ref['id'], net) else: address = network_ref['vpn_public_address'] + network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref) self.driver.ensure_vlan_bridge(network_ref['vlan'], network_ref['bridge'], network_ref['bridge_interface'], |