diff options
-rw-r--r-- | lib/chef/provider/ifconfig/redhat.rb | 4 | ||||
-rw-r--r-- | lib/chef/resource/ifconfig.rb | 36 | ||||
-rw-r--r-- | spec/unit/provider/ifconfig/redhat_spec.rb | 8 |
3 files changed, 48 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 diff --git a/spec/unit/provider/ifconfig/redhat_spec.rb b/spec/unit/provider/ifconfig/redhat_spec.rb index 2111de02fb..0a91137416 100644 --- a/spec/unit/provider/ifconfig/redhat_spec.rb +++ b/spec/unit/provider/ifconfig/redhat_spec.rb @@ -31,6 +31,10 @@ 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" + @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) @@ -52,6 +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 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) |