diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-09 20:49:25 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-09 20:49:25 +0000 |
| commit | 10626fc89e0f842b095b7c5864bb91e762984fbc (patch) | |
| tree | d8031c2d9ea1a4e33e553eecb9b83449204e4818 /nova | |
| parent | 3c5f3a0a058d5a5241e0fbbe921bf9eaf23f97c8 (diff) | |
| parent | ef9217548b1ae74d3e4f7282d26e0d9fee5470ce (diff) | |
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.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index fbcbea131..8eb9f041b 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -118,6 +118,10 @@ class NetworkManager(manager.Manager): 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 @@ class FlatDHCPManager(FlatManager): 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 @@ class VlanManager(NetworkManager): 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): |