From 42a7d2b6d44be5fd6e41734902e08897b709015d Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 3 Jun 2016 15:06:55 -0400
Subject: config drive conversion: recognize 'bridge' as a physical type, fix
 mtu

the network json in openstack provides a type of 'bridge' when
the underlying (host) type is a bridge.  Silly, but we need to
consider that a physical device as it will be for us.

also, the 'mtu' will appear on the link, not on the route
---
 cloudinit/sources/DataSourceConfigDrive.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cloudinit/sources/DataSourceConfigDrive.py')

diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
index 3cc9155d..c87f57fd 100644
--- a/cloudinit/sources/DataSourceConfigDrive.py
+++ b/cloudinit/sources/DataSourceConfigDrive.py
@@ -293,6 +293,7 @@ def convert_network_data(network_json=None, known_macs=None):
             'mac_address',
             'subnets',
             'params',
+            'mtu',
         ],
         'subnet': [
             'type',
@@ -302,7 +303,6 @@ def convert_network_data(network_json=None, known_macs=None):
             'metric',
             'gateway',
             'pointopoint',
-            'mtu',
             'scope',
             'dns_nameservers',
             'dns_search',
@@ -342,7 +342,7 @@ def convert_network_data(network_json=None, known_macs=None):
                 })
             subnets.append(subnet)
         cfg.update({'subnets': subnets})
-        if link['type'] in ['ethernet', 'vif', 'ovs', 'phy']:
+        if link['type'] in ['ethernet', 'vif', 'ovs', 'phy', 'bridge']:
             cfg.update({
                 'type': 'physical',
                 'mac_address': link['ethernet_mac_address']})
-- 
cgit v1.2.3