diff options
| author | vladimir.p <vladimir@zadarastorage.com> | 2011-07-22 20:26:56 -0700 |
|---|---|---|
| committer | vladimir.p <vladimir@zadarastorage.com> | 2011-07-22 20:26:56 -0700 |
| commit | 10006a77176f5ffc6e9acd94fe44e6e6695a6716 (patch) | |
| tree | 7209a65a0dab6e1f247c6f83b0b12d44545c0bb4 | |
| parent | 61781dae931ced36db0f2735da474d0bd38a53cf (diff) | |
| parent | 1a18ea6d738b513e03e3f0eddfb9f01dff9addca (diff) | |
merged with latest nova-1308
| -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 7301df64b..4f984296c 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -898,7 +898,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 @@ -906,6 +905,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'], |