diff options
| -rw-r--r-- | os_net_config/impl_eni.py | 12 | ||||
| -rw-r--r-- | os_net_config/tests/test_impl_eni.py | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/os_net_config/impl_eni.py b/os_net_config/impl_eni.py index f676a7e..b600fd9 100644 --- a/os_net_config/impl_eni.py +++ b/os_net_config/impl_eni.py @@ -149,15 +149,19 @@ class ENINetConfig(os_net_config.NetConfig): def apply(self): new_config = "" - for interface_name, iface_data in self.interfaces.iteritems(): - route_data = self.routes.get(interface_name) - iface_data += (route_data or '') - new_config += iface_data + # write out bridges first. This ensures that an ifup -a + # on reboot brings them up first for bridge_name, bridge_data in self.bridges.iteritems(): route_data = self.routes.get(bridge_name) bridge_data += (route_data or '') new_config += bridge_data + + for interface_name, iface_data in self.interfaces.iteritems(): + route_data = self.routes.get(interface_name) + iface_data += (route_data or '') + new_config += iface_data + if (utils.diff(_network_config_path(), new_config)): for interface in self.interfaces.keys(): processutils.execute('/sbin/ifdown', interface, diff --git a/os_net_config/tests/test_impl_eni.py b/os_net_config/tests/test_impl_eni.py index a3656bf..28c9c98 100644 --- a/os_net_config/tests/test_impl_eni.py +++ b/os_net_config/tests/test_impl_eni.py @@ -198,4 +198,4 @@ class TestENINetConfigApply(base.TestCase): self.provider.addBridge(bridge) self.provider.apply() iface_data = utils.get_file_data(self.temp_config_file.name) - self.assertEqual((_OVS_PORT_IFACE + _OVS_BRIDGE_DHCP), iface_data) + self.assertEqual((_OVS_BRIDGE_DHCP + _OVS_PORT_IFACE), iface_data) |