From d14d64c41b11bc67d1becb9c9ee73f70be001f2d Mon Sep 17 00:00:00 2001
From: jeffNagra <jeff.sault@nagra.com>
Date: Wed, 23 Apr 2014 09:22:29 +0100
Subject: [PATCH 1/2] use macaddress_ethX fact for default mac address

---
 manifests/bond/slave.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifests/bond/slave.pp b/manifests/bond/slave.pp
index 00003e36..b6e9a8b7 100644
--- a/manifests/bond/slave.pp
+++ b/manifests/bond/slave.pp
@@ -4,7 +4,7 @@
 #
 # === Parameters:
 #
-#   $macaddress   - required
+#   $macaddress   - optional 
 #   $master       - required
 #   $ethtool_opts - optional
 #
@@ -19,7 +19,6 @@
 # === Sample Usage:
 #
 #   network::bond::slave { 'eth1':
-#     macaddress => $::macaddress_eth1,
 #     master     => 'bond0',
 #   }
 #
@@ -32,13 +31,15 @@
 # Copyright (C) 2011 Mike Arnold, unless otherwise noted.
 #
 define network::bond::slave (
-  $macaddress,
+  $macaddress ='',
   $master,
   $ethtool_opts = ''
 ) {
   # Validate our data
   if ! is_mac_address($macaddress) {
-    fail("${macaddress} is not a MAC address.")
+    $macaddy = getvar("::macaddress_${title}")
+  } else {
+    $macaddy = $macaddress
   }
 
   include 'network'

From 89063035c34e7841f75c335b7b840e871750a78a Mon Sep 17 00:00:00 2001
From: jeffNagra <jeff.sault@nagra.com>
Date: Fri, 27 Jun 2014 09:42:59 +0100
Subject: [PATCH 2/2] Update ifcfg-bond.erb

---
 templates/ifcfg-bond.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/ifcfg-bond.erb b/templates/ifcfg-bond.erb
index eaeb2add..49ccbb3f 100644
--- a/templates/ifcfg-bond.erb
+++ b/templates/ifcfg-bond.erb
@@ -2,7 +2,7 @@
 ### File managed by Puppet
 ###
 DEVICE=<%= @interface %>
-HWADDR=<%= @macaddress %>
+HWADDR=<%= @macaddy %>
 MASTER=<%= @master %>
 SLAVE=yes
 TYPE=Ethernet