diff options
author | Tim Smith <tsmith@chef.io> | 2018-07-16 15:27:49 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2018-07-16 15:27:49 -0700 |
commit | 03f38c0120732b5167547566d086350f82e83abe (patch) | |
tree | cd03fbf9dd495b44ff621e3010635ddbba1df0c6 | |
parent | 4d229297e8323b5287916b80f93f44d83800dfb3 (diff) | |
parent | e2ea0b66b0801c0f83f84def14fdf8b09d30fa48 (diff) | |
download | chef-03f38c0120732b5167547566d086350f82e83abe.tar.gz |
Merge branch 'vlan' of https://github.com/tomdoherty/chef into tomdoherty-vlan
-rw-r--r-- | lib/chef/provider/ifconfig/redhat.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/ifconfig.rb | 8 | ||||
-rw-r--r-- | spec/unit/provider/ifconfig/redhat_spec.rb | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/lib/chef/provider/ifconfig/redhat.rb b/lib/chef/provider/ifconfig/redhat.rb index bf3d979e86..24cea17b1a 100644 --- a/lib/chef/provider/ifconfig/redhat.rb +++ b/lib/chef/provider/ifconfig/redhat.rb @@ -42,6 +42,7 @@ class Chef <% 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 %> +<% if new_resource.vlan %>VLAN=<%= new_resource.vlan %><% 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 d43b8c2d58..f6f9abedee 100644 --- a/lib/chef/resource/ifconfig.rb +++ b/lib/chef/resource/ifconfig.rb @@ -92,6 +92,14 @@ class Chef property :slave, String, introduced: "13.4", description: "When set to yes, this device is controlled by the channel bonding interface that is specified via the master property." + + property :vlan, String, + introduced: "14.4", + description: "The VLAN to assign the interface to." + + property :gateways, String, + introduced: "14.4", + description: "The gateway to assign the interface to." end end end diff --git a/spec/unit/provider/ifconfig/redhat_spec.rb b/spec/unit/provider/ifconfig/redhat_spec.rb index d81f963450..75291d3bf9 100644 --- a/spec/unit/provider/ifconfig/redhat_spec.rb +++ b/spec/unit/provider/ifconfig/redhat_spec.rb @@ -35,6 +35,7 @@ describe Chef::Provider::Ifconfig::Redhat do @new_resource.bonding_opts "mode=active-backup miimon=100" @new_resource.master "bond0" @new_resource.slave "yes" + @new_resource.vlan "yes" @provider = Chef::Provider::Ifconfig::Redhat.new(@new_resource, @run_context) @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context) @@ -60,6 +61,7 @@ describe Chef::Provider::Ifconfig::Redhat do 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*VLAN=yes\s*$/) end expect(@config).to receive(:run_action).with(:create) expect(@config).to receive(:updated?).and_return(true) |