Merge pull request #6384 from tomdoherty/master

Add support for specifying ETHTOOL_OPTS

2 files changed, 40 insertions, 0 deletions

diff --git a/lib/chef/provider/ifconfig/redhat.rb b/lib/chef/provider/ifconfig/redhat.rb
index 8af9f10f67..1f4f6d972a 100644
--- a/lib/chef/provider/ifconfig/redhat.rb
+++ b/lib/chef/provider/ifconfig/redhat.rb
@@ -38,6 +38,10 @@ class Chef
 <% if new_resource.hwaddr %>HWADDR=<%= new_resource.hwaddr %><% end %>
 <% if new_resource.metric %>METRIC=<%= new_resource.metric %><% end %>
 <% if new_resource.mtu %>MTU=<%= new_resource.mtu %><% end %>
+<% if new_resource.ethtool_opts %>ETHTOOL_OPTS=<%= new_resource.ethtool_opts %><% end %>
+<% if new_resource.bonding_opts %>BONDING_OPTS=<%= new_resource.bonding_opts %><% end %>
+<% if new_resource.master %>MASTER=<%= new_resource.master %><% end %>
+<% if new_resource.slave %>SLAVE=<%= new_resource.slave %><% end %>
           }
           @config_path = "/etc/sysconfig/network-scripts/ifcfg-#{new_resource.device}"
         end
diff --git a/lib/chef/resource/ifconfig.rb b/lib/chef/resource/ifconfig.rb
index fd523d9580..3673311348 100644
--- a/lib/chef/resource/ifconfig.rb
+++ b/lib/chef/resource/ifconfig.rb
@@ -44,6 +44,10 @@ class Chef
         @network = nil
         @bootproto = nil
         @onparent = nil
+        @ethtool_opts = nil
+        @bonding_opts = nil
+        @master = nil
+        @slave = nil
       end
 
       def target(arg = nil)
@@ -141,6 +145,38 @@ class Chef
           :kind_of => String
         )
       end
+
+      def ethtool_opts(arg = nil)
+        set_or_return(
+          :ethtool_opts,
+          arg,
+          :kind_of => String
+        )
+      end
+
+      def bonding_opts(arg = nil)
+        set_or_return(
+          :bonding_opts,
+          arg,
+          :kind_of => String
+        )
+      end
+
+      def master(arg = nil)
+        set_or_return(
+          :master,
+          arg,
+          :kind_of => String
+        )
+      end
+
+      def slave(arg = nil)
+        set_or_return(
+          :slave,
+          arg,
+          :kind_of => String
+        )
+      end
     end
 
   end