From 2f55afedd53c62d16b1eb11324296ffc86f4ef18 Mon Sep 17 00:00:00 2001
From: gbarton <garrett.barton@gmail.com>
Date: Mon, 20 Apr 2015 14:36:18 -0400
Subject: [PATCH 1/2] allow DNS to pickup hostname

enable bonded dhcp interfaces to correctly auto populate DNS entries.
---
 manifests/bond/dynamic.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/bond/dynamic.pp b/manifests/bond/dynamic.pp
index 996e519c..66582602 100644
--- a/manifests/bond/dynamic.pp
+++ b/manifests/bond/dynamic.pp
@@ -10,6 +10,7 @@
 #   $mtu          - optional
 #   $ethtool_opts - optional
 #   $bonding_opts - optional
+#   $dhcp_hostname- optional
 #
 # === Actions:
 #
@@ -34,7 +35,8 @@
   $ensure,
   $mtu = '',
   $ethtool_opts = '',
-  $bonding_opts = 'miimon=100'
+  $bonding_opts = 'miimon=100',
+  $dhcp_hostname = ''
 ) {
   # Validate our regular expressions
   $states = [ '^up$', '^down$' ]
@@ -47,6 +49,7 @@
     gateway      => '',
     macaddress   => '',
     bootproto    => 'dhcp',
+    dhcp_hostname=> $dhcp_hostname,
     ipv6address  => '',
     ipv6gateway  => '',
     mtu          => $mtu,

From 899dfbd86c4ff4e07b0b057d312af709fa0a7630 Mon Sep 17 00:00:00 2001
From: gbarton <garrett.barton@gmail.com>
Date: Mon, 20 Apr 2015 14:39:04 -0400
Subject: [PATCH 2/2] stop constant network restart

when disabling ipv6 this line needs to be there, else network service puts it in on restart, hash changes, puppet pushes removing the line, services restarts... you get the idea.
---
 templates/network.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/network.erb b/templates/network.erb
index 6ff541b7..1d2c7f29 100644
--- a/templates/network.erb
+++ b/templates/network.erb
@@ -3,6 +3,7 @@
 ###
 NETWORKING=yes
 <% if !@ipv6networking %>NETWORKING_IPV6=no
+IPV6INIT=no
 <% else %>NETWORKING_IPV6=yes
 <% if !@ipv6gateway.empty? %>IPV6_DEFAULTGW=<%= @ipv6gateway %>
 <% end -%>