summaryrefslogtreecommitdiff
path: root/lib/chef/resource
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-07-16 15:27:49 -0700
committerTim Smith <tsmith@chef.io>2018-07-16 15:27:49 -0700
commit03f38c0120732b5167547566d086350f82e83abe (patch)
treecd03fbf9dd495b44ff621e3010635ddbba1df0c6 /lib/chef/resource
parent4d229297e8323b5287916b80f93f44d83800dfb3 (diff)
parente2ea0b66b0801c0f83f84def14fdf8b09d30fa48 (diff)
downloadchef-03f38c0120732b5167547566d086350f82e83abe.tar.gz
Merge branch 'vlan' of https://github.com/tomdoherty/chef into tomdoherty-vlan
Diffstat (limited to 'lib/chef/resource')
-rw-r--r--lib/chef/resource/ifconfig.rb8
1 files changed, 8 insertions, 0 deletions
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