From 804594e0b83ba96bce741141725ddc8daa827317 Mon Sep 17 00:00:00 2001
From: "Santana, Divan" <dsantana@fnb.co.za>
Date: Wed, 6 Aug 2014 09:13:32 +0200
Subject: [PATCH] Add support for z/linux networking params NETTYPE and
 SUBCHANNELS

---
 manifests/if/static.pp  | 6 ++++++
 manifests/init.pp       | 4 ++++
 templates/ifcfg-eth.erb | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/manifests/if/static.pp b/manifests/if/static.pp
index a6d34d4d..3cea6580 100644
--- a/manifests/if/static.pp
+++ b/manifests/if/static.pp
@@ -12,6 +12,8 @@
 #   $userctl      - optional - defaults to false
 #   $mtu          - optional
 #   $ethtool_opts - optional
+#   $subchannels  - optional
+#   $nettype      - optional
 #   $peerdns      - optional
 #   $dns1         - optional
 #   $dns2         - optional
@@ -48,6 +50,8 @@
   $userctl = false,
   $mtu = '',
   $ethtool_opts = '',
+  $subchannels = '',
+  $nettype = '',
   $peerdns = false,
   $dns1 = '',
   $dns2 = '',
@@ -74,6 +78,8 @@
     userctl      => $userctl,
     mtu          => $mtu,
     ethtool_opts => $ethtool_opts,
+    subchannels  => $subchannels,
+    nettype      => $nettype,
     peerdns      => $peerdns,
     dns1         => $dns1,
     dns2         => $dns2,
diff --git a/manifests/init.pp b/manifests/init.pp
index 1ec4f85d..7b23da6f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -58,6 +58,8 @@
 #   $userctl      - optional - defaults to false
 #   $mtu          - optional
 #   $ethtool_opts - optional
+#   $subchannels  - optional
+#   $nettype      - optional
 #   $bonding_opts - optional
 #   $isalias      - optional
 #   $peerdns      - optional
@@ -102,6 +104,8 @@
   $userctl = false,
   $mtu = '',
   $ethtool_opts = '',
+  $subchannels = '',
+  $nettype = '',
   $bonding_opts = undef,
   $isalias = false,
   $peerdns = false,
diff --git a/templates/ifcfg-eth.erb b/templates/ifcfg-eth.erb
index b9bd1753..670a3075 100644
--- a/templates/ifcfg-eth.erb
+++ b/templates/ifcfg-eth.erb
@@ -20,6 +20,10 @@ TYPE=Ethernet
 <% end -%>
 <% if !@ethtool_opts.empty? %>ETHTOOL_OPTS="<%= @ethtool_opts %>"
 <% end -%>
+<% if !@subchannels.empty? %>SUBCHANNELS="<%= @subchannels %>"
+<% end -%>
+<% if !@nettype.empty? %>NETTYPE="<%= @nettype %>"
+<% end -%>
 <% if !@peerdns %>PEERDNS=no
 <% else %>PEERDNS=yes
 <% if !@dns1_real.empty? %>DNS1=<%= @dns1_real %>