From d6f64ab5fd1b4c53fd8b21e9049fc652519c4488 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Thu, 1 Dec 2016 16:56:39 -0500
Subject: cherry pick 2d2ec70

LP: #1642679
---
 debian/changelog                                   |  4 +-
 ...-extend-physical-types-to-include-hyperv-hw_veb | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/cpick-2d2ec70-OpenStack-extend-physical-types-to-include-hyperv-hw_veb

diff --git a/debian/changelog b/debian/changelog
index c05d4cf3..e03119f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.2) UNRELEASED; urgency=medium
     line not only ip= (LP: #1639930)
   * cherry-pick 8c6878a: tests: fix assumptions that expected no eth0 in
     system. (LP: #1644043)
+  * cherry-pick 2d2ec70: OpenStack: extend physical types to include
+    hyperv, hw_veb, vhost_user. (LP: #1642679)
 
- -- Scott Moser <smoser@ubuntu.com>  Thu, 01 Dec 2016 16:56:25 -0500
+ -- Scott Moser <smoser@ubuntu.com>  Thu, 01 Dec 2016 16:56:31 -0500
 
 cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
diff --git a/debian/patches/cpick-2d2ec70-OpenStack-extend-physical-types-to-include-hyperv-hw_veb b/debian/patches/cpick-2d2ec70-OpenStack-extend-physical-types-to-include-hyperv-hw_veb
new file mode 100644
index 00000000..5292e491
--- /dev/null
+++ b/debian/patches/cpick-2d2ec70-OpenStack-extend-physical-types-to-include-hyperv-hw_veb
@@ -0,0 +1,43 @@
+commit 2d2ec70f06015f0624f1d0d328cc97f1fb5c29de
+Author: Scott Moser <smoser@brickies.net>
+Date:   Tue Nov 22 16:39:13 2016 -0500
+
+    OpenStack: extend physical types to include hyperv, hw_veb, vhost_user.
+    
+    This extends the list of device 'types' that are considered to be physical
+    to include hyperv, hw_veb, and vhost_user.
+    
+    LP: #1642679
+
+--- a/cloudinit/sources/helpers/openstack.py
++++ b/cloudinit/sources/helpers/openstack.py
+@@ -61,6 +61,19 @@ OS_VERSIONS = (
+     OS_LIBERTY,
+ )
+ 
++PHYSICAL_TYPES = (
++    None,
++    'bridge',
++    'ethernet',
++    'hw_veb',
++    'hyperv',
++    'ovs',
++    'phy',
++    'tap',
++    'vhostuser',
++    'vif',
++)
++
+ 
+ class NonReadable(IOError):
+     pass
+@@ -583,8 +596,7 @@ def convert_net_json(network_json=None,
+                 subnet['ipv6'] = True
+             subnets.append(subnet)
+         cfg.update({'subnets': subnets})
+-        if link['type'] in [None, 'ethernet', 'vif', 'ovs', 'phy',
+-                            'bridge', 'tap']:
++        if link['type'] in PHYSICAL_TYPES:
+             cfg.update({'type': 'physical', 'mac_address': link_mac_addr})
+         elif link['type'] in ['bond']:
+             params = {}
diff --git a/debian/patches/series b/debian/patches/series
index f55f599b..4e1ef425 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 cpick-18203bf-disk_setup-Use-sectors-as-unit-when-formatting-MBR-disks
 cpick-6e92c5f-net-cmdline-Consider-ip-or-ip6-on-command-line-not-only
 cpick-8c6878a-tests-fix-assumptions-that-expected-no-eth0-in-system
+cpick-2d2ec70-OpenStack-extend-physical-types-to-include-hyperv-hw_veb
-- 
cgit v1.2.3