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

[Vish Ishaya]

Fixes the ordering of init_host commands so that iptables chains are created before they are used.

This fixes an issue that arises if nova-network is started with flushed iptables after floating ips have been assigned.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Thierry Carrez (ttx)]

Too late for Bexar, please submit in Cactus.

review: Needs Resubmitting (rcfe)

[Thierry Carrez (ttx)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

I think this proposal got lost through the release. It could use a little love.

[Devin Carlen (devcamcar)]

re-loved

review: Approve

[Soren Hansen (soren)]

lgtm

review: Approve

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-01-26 21:58:24 +0000
+++ nova/network/manager.py	2011-02-02 16:20:24 +0000
@@ -118,6 +118,10 @@
         super(NetworkManager, self).__init__(*args, **kwargs)
 
     def init_host(self):
+        """Do any initialization that needs to be run if this is a
+        standalone service.
+        """
+        self.driver.init_host()
         # Set up networking for the projects for which we're already
         # the designated network host.
         ctxt = context.get_admin_context()
@@ -395,7 +399,6 @@
         standalone service.
         """
         super(FlatDHCPManager, self).init_host()
-        self.driver.init_host()
         self.driver.metadata_forward()
 
     def setup_compute_network(self, context, instance_id):
@@ -465,7 +468,6 @@
         standalone service.
         """
         super(VlanManager, self).init_host()
-        self.driver.init_host()
         self.driver.metadata_forward()
 
     def allocate_fixed_ip(self, context, instance_id, *args, **kwargs):