Merge lp:~vishvananda/nova/lp814471 into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Fixes an issue with out of order operations in setup_network for vlan mode in new ha-net code.

[Brian Waldon (bcwaldon)]

Approved.

review: Approve

[Brian Lamar (blamar)]

Approved.

review: Approve

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-07-22 21:48:04 +0000
+++ nova/network/manager.py	2011-07-22 22:43:58 +0000
@@ -898,7 +898,6 @@
 
     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 @@
             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'],