summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Doherty <tom.doherty@fixnetix.com>2017-09-07 21:22:54 +0100
committerTom Doherty <tom.doherty@fixnetix.com>2017-09-07 21:22:54 +0100
commit37829e9f1f12f8cf0aa5a6ec09bd0053c2057846 (patch)
tree4e1e3bf11ed763720819fb7d5837db7ded0fb1fd
parent32c323bea2030096a0a9d04102751842d9c7d001 (diff)
downloadchef-37829e9f1f12f8cf0aa5a6ec09bd0053c2057846.tar.gz
Add options for bonding NICs on RHEL/Centos
Signed-off-by: Tom Doherty <tom.doherty@fixnetix.com>
-rw-r--r--lib/chef/provider/ifconfig/redhat.rb3
-rw-r--r--lib/chef/resource/ifconfig.rb27
-rw-r--r--spec/unit/provider/ifconfig/redhat_spec.rb6
3 files changed, 36 insertions, 0 deletions
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)