← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/network/manager.py

  • Committer: Tarmac
  • Author(s): Vishvananda Ishaya
  • Date: 2011-07-23 01:52:43 UTC
  • mfrom: (1304.2.1 lp814471)
  • Revision ID: tarmac-20110723015243-qnunu03gyh3n1d6p
Fixes an issue with out of order operations in setup_network for vlan mode in new ha-net code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/manager.py
898
898
 
899
899
    def _setup_network(self, context, network_ref):
900
900
        """Sets up network on this host."""
901
 
        network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
902
901
        if not network_ref['vpn_public_address']:
903
902
            net = {}
904
903
            address = FLAGS.vpn_ip
906
905
            network_ref = db.network_update(context, network_ref['id'], net)
907
906
        else:
908
907
            address = network_ref['vpn_public_address']
 
908
        network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
909
909
        self.driver.ensure_vlan_bridge(network_ref['vlan'],
910
910
                                       network_ref['bridge'],
911
911
                                       network_ref['bridge_interface'],