diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-07-23 01:52:43 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-23 01:52:43 +0000 |
| commit | 5c12e11b83de9deeb6dd6fb3edcd36349b248e48 (patch) | |
| tree | 76297af9200eba851b82c0be19e40bb36c3276a1 | |
| parent | c3a0c914b17d3ad677208808162065b1688ec9ac (diff) | |
| parent | fc00b24ddd4d2eceb68199b059fb895604ce361d (diff) | |
| download | nova-5c12e11b83de9deeb6dd6fb3edcd36349b248e48.tar.gz nova-5c12e11b83de9deeb6dd6fb3edcd36349b248e48.tar.xz nova-5c12e11b83de9deeb6dd6fb3edcd36349b248e48.zip | |
Fixes an issue with out of order operations in setup_network for vlan mode in new ha-net code.
| -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'], |