diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 22:53:09 +0000 |
|---|---|---|
| committer | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 22:53:09 +0000 |
| commit | 2155505ca082c644e7b4f373d8fae3e157a451bb (patch) | |
| tree | f5ace09dba0ccb7ddda82b3a8a6cf3359c03cf04 | |
| parent | 7a57a10a6a12302915ebbac0744833e365d7961b (diff) | |
| download | nova-2155505ca082c644e7b4f373d8fae3e157a451bb.tar.gz nova-2155505ca082c644e7b4f373d8fae3e157a451bb.tar.xz nova-2155505ca082c644e7b4f373d8fae3e157a451bb.zip | |
Moving init_host before metadata_forward, as metadata_forward modifies prerouting rules
| -rw-r--r-- | nova/network/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 7bc41b577..fe99f2612 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -395,8 +395,8 @@ class FlatDHCPManager(FlatManager): standalone service. """ super(FlatDHCPManager, self).init_host() - self.driver.metadata_forward() self.driver.init_host() + self.driver.metadata_forward() def setup_compute_network(self, context, instance_id): """Sets up matching network for compute hosts.""" @@ -461,8 +461,8 @@ class VlanManager(NetworkManager): standalone service. """ super(VlanManager, self).init_host() - self.driver.metadata_forward() self.driver.init_host() + self.driver.metadata_forward() def allocate_fixed_ip(self, context, instance_id, *args, **kwargs): """Gets a fixed ip from the pool.""" |