summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Doherty <tom.doherty@fixnetix.com>2017-09-07 20:51:20 +0100
committerTom Doherty <tom.doherty@fixnetix.com>2017-09-07 20:51:20 +0100
commit32c323bea2030096a0a9d04102751842d9c7d001 (patch)
tree0620c8a444995085cb2e19286cc399c427e70d2e
parenta06b75f3f29e707872e3d615c15d4842c6874fb7 (diff)
downloadchef-32c323bea2030096a0a9d04102751842d9c7d001.tar.gz
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 <tom.doherty@fixnetix.com>
-rw-r--r--lib/chef/provider/ifconfig/redhat.rb1
-rw-r--r--lib/chef/resource/ifconfig.rb9
-rw-r--r--spec/unit/provider/ifconfig/redhat_spec.rb2
3 files changed, 12 insertions, 0 deletions
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)