From 32c323bea2030096a0a9d04102751842d9c7d001 Mon Sep 17 00:00:00 2001 From: Tom Doherty Date: Thu, 7 Sep 2017 20:51:20 +0100 Subject: Add support for specifying ETHTOOL_OPTS on Red Hat Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as Indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. Signed-off-by: Tom Doherty --- lib/chef/provider/ifconfig/redhat.rb | 1 + lib/chef/resource/ifconfig.rb | 9 +++++++++ spec/unit/provider/ifconfig/redhat_spec.rb | 2 ++ 3 files changed, 12 insertions(+) diff --git a/lib/chef/provider/ifconfig/redhat.rb b/lib/chef/provider/ifconfig/redhat.rb index 8af9f10f67..cce7e9dc3b 100644 --- a/lib/chef/provider/ifconfig/redhat.rb +++ b/lib/chef/provider/ifconfig/redhat.rb @@ -38,6 +38,7 @@ 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 %> } @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..a8317f8c57 100644 --- a/lib/chef/resource/ifconfig.rb +++ b/lib/chef/resource/ifconfig.rb @@ -44,6 +44,7 @@ class Chef @network = nil @bootproto = nil @onparent = nil + @ethtool_opts = nil end def target(arg = nil) @@ -141,6 +142,14 @@ class Chef :kind_of => String ) end + + def ethtool_opts(arg = nil) + set_or_return( + :ethtool_opts, + arg, + :kind_of => String + ) + end end end diff --git a/spec/unit/provider/ifconfig/redhat_spec.rb b/spec/unit/provider/ifconfig/redhat_spec.rb index 2111de02fb..08abacdc59 100644 --- a/spec/unit/provider/ifconfig/redhat_spec.rb +++ b/spec/unit/provider/ifconfig/redhat_spec.rb @@ -31,6 +31,7 @@ describe Chef::Provider::Ifconfig::Redhat do @new_resource.metric "1" @new_resource.mtu "1500" @new_resource.device "eth0" + @new_resource.ethtool_opts "-A eth0 autoneg off" @provider = Chef::Provider::Ifconfig::Redhat.new(@new_resource, @run_context) @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context) @@ -52,6 +53,7 @@ describe Chef::Provider::Ifconfig::Redhat do expect(arg).to match(/^\s*DEVICE=eth0\s*$/) expect(arg).to match(/^\s*IPADDR=10\.0\.0\.1\s*$/) expect(arg).to match(/^\s*NETMASK=255\.255\.254\.0\s*$/) + expect(arg).to match(/^\s*ETHTOOL_OPTS=-A eth3 autoneg off\s*$/) end expect(@config).to receive(:run_action).with(:create) expect(@config).to receive(:updated?).and_return(true) -- cgit v1.2.1 From 37829e9f1f12f8cf0aa5a6ec09bd0053c2057846 Mon Sep 17 00:00:00 2001 From: Tom Doherty Date: Thu, 7 Sep 2017 21:22:54 +0100 Subject: Add options for bonding NICs on RHEL/Centos Signed-off-by: Tom Doherty --- lib/chef/provider/ifconfig/redhat.rb | 3 +++ lib/chef/resource/ifconfig.rb | 27 +++++++++++++++++++++++++++ spec/unit/provider/ifconfig/redhat_spec.rb | 6 ++++++ 3 files changed, 36 insertions(+) diff --git a/lib/chef/provider/ifconfig/redhat.rb b/lib/chef/provider/ifconfig/redhat.rb index cce7e9dc3b..1f4f6d972a 100644 --- a/lib/chef/provider/ifconfig/redhat.rb +++ b/lib/chef/provider/ifconfig/redhat.rb @@ -39,6 +39,9 @@ class Chef <% 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 a8317f8c57..3673311348 100644 --- a/lib/chef/resource/ifconfig.rb +++ b/lib/chef/resource/ifconfig.rb @@ -45,6 +45,9 @@ class Chef @bootproto = nil @onparent = nil @ethtool_opts = nil + @bonding_opts = nil + @master = nil + @slave = nil end def target(arg = nil) @@ -150,6 +153,30 @@ class Chef :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 diff --git a/spec/unit/provider/ifconfig/redhat_spec.rb b/spec/unit/provider/ifconfig/redhat_spec.rb index 08abacdc59..5820cc6879 100644 --- a/spec/unit/provider/ifconfig/redhat_spec.rb +++ b/spec/unit/provider/ifconfig/redhat_spec.rb @@ -32,6 +32,9 @@ describe Chef::Provider::Ifconfig::Redhat do @new_resource.mtu "1500" @new_resource.device "eth0" @new_resource.ethtool_opts "-A eth0 autoneg off" + @new_resource.bonding_opts "mode=active-backup miimon=100" + @new_resource.master "bond0" + @new_resource.slave "yes" @provider = Chef::Provider::Ifconfig::Redhat.new(@new_resource, @run_context) @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context) @@ -54,6 +57,9 @@ describe Chef::Provider::Ifconfig::Redhat do expect(arg).to match(/^\s*IPADDR=10\.0\.0\.1\s*$/) expect(arg).to match(/^\s*NETMASK=255\.255\.254\.0\s*$/) expect(arg).to match(/^\s*ETHTOOL_OPTS=-A eth3 autoneg off\s*$/) + expect(arg).to match(/^\s*BONDING_OPTS="mode=active-backup miimon=100"\s*$/) + expect(arg).to match(/^\s*MASTER=bond0"\s*$/) + expect(arg).to match(/^\s*SLAVE=yes"\s*$/) end expect(@config).to receive(:run_action).with(:create) expect(@config).to receive(:updated?).and_return(true) -- cgit v1.2.1 From 6968a6aee8300b07a0b60f84145ea4c459a4c84a Mon Sep 17 00:00:00 2001 From: Tom Doherty Date: Fri, 8 Sep 2017 00:08:37 +0100 Subject: Fix unit tests for ethtool/bonding change Signed-off-by: Tom Doherty --- spec/unit/provider/ifconfig/redhat_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/unit/provider/ifconfig/redhat_spec.rb b/spec/unit/provider/ifconfig/redhat_spec.rb index 5820cc6879..0a91137416 100644 --- a/spec/unit/provider/ifconfig/redhat_spec.rb +++ b/spec/unit/provider/ifconfig/redhat_spec.rb @@ -56,10 +56,10 @@ describe Chef::Provider::Ifconfig::Redhat do expect(arg).to match(/^\s*DEVICE=eth0\s*$/) expect(arg).to match(/^\s*IPADDR=10\.0\.0\.1\s*$/) expect(arg).to match(/^\s*NETMASK=255\.255\.254\.0\s*$/) - expect(arg).to match(/^\s*ETHTOOL_OPTS=-A eth3 autoneg off\s*$/) - expect(arg).to match(/^\s*BONDING_OPTS="mode=active-backup miimon=100"\s*$/) - expect(arg).to match(/^\s*MASTER=bond0"\s*$/) - expect(arg).to match(/^\s*SLAVE=yes"\s*$/) + expect(arg).to match(/^\s*ETHTOOL_OPTS=-A eth0 autoneg off\s*$/) + expect(arg).to match(/^\s*BONDING_OPTS=mode=active-backup miimon=100\s*$/) + expect(arg).to match(/^\s*MASTER=bond0\s*$/) + expect(arg).to match(/^\s*SLAVE=yes\s*$/) end expect(@config).to receive(:run_action).with(:create) expect(@config).to receive(:updated?).and_return(true) -- cgit v1.2.1