From 571cc8f598eaa197a23296757bcdb2802f9664f1 Mon Sep 17 00:00:00 2001
From: Dave House <dhouse@mozilla.com>
Date: Tue, 18 Apr 2017 10:09:25 -0600
Subject: [PATCH] Bug 1355095 - apply ubuntu 16.04 /etc/network/interfaces.
 r=dividehex

---
 modules/network/manifests/init.pp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/network/manifests/init.pp b/modules/network/manifests/init.pp
index d4d205da2e..d27ce50245 100644
--- a/modules/network/manifests/init.pp
+++ b/modules/network/manifests/init.pp
@@ -30,6 +30,22 @@
         }
     }
 
+    # Bug 1355095 - Network configuration issue on Ubuntu 16.04 Xen VM
+    case $::operatingsystem {
+        Ubuntu: {
+            case $::operatingsystemrelease {
+                16.04: {
+                    if ($::virtual == "xenhvm") {
+                        file {
+                            "/etc/network/interfaces":
+                                content => template("network/ubuntu_interfaces.erb");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     if ($::config::manage_ifcfg) {
         # ensure interface configuration is correct
         # (in particular, don't use peer NTP configuration, as that comes from puppet)