summaryrefslogtreecommitdiff
path: root/lib/chef/resource/mount.rb
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2018-03-13 14:16:03 +0000
committerThom May <thom@chef.io>2018-03-14 16:29:48 +0000
commitc4ce9d9393d88f1f441f588fed70720b747cfd72 (patch)
treed923ef73e54dcaeb50eee47ceba8bae623f6b46f /lib/chef/resource/mount.rb
parent61e3d4bb382da5a0f6c09dd144ce4c6fc96c3ca9 (diff)
downloadchef-c4ce9d9393d88f1f441f588fed70720b747cfd72.tar.gz
Clean up mount provider teststm/6851
Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'lib/chef/resource/mount.rb')
-rw-r--r--lib/chef/resource/mount.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb
index 119363aea7..dffb96cb53 100644
--- a/lib/chef/resource/mount.rb
+++ b/lib/chef/resource/mount.rb
@@ -28,8 +28,9 @@ class Chef
allowed_actions :mount, :umount, :unmount, :remount, :enable, :disable
# this is a poor API please do not re-use this pattern
- property :supports, Hash, default: lazy { { remount: false } },
- coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x }
+ property :supports, Hash,
+ default: lazy { { remount: false } },
+ coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x }
property :password, String, sensitive: true
@@ -42,9 +43,9 @@ class Chef
equal_to: RUBY_PLATFORM =~ /solaris/i ? %i{ device } : %i{ device label uuid }
property :fsck_device, String, default: "-"
- property :fstype, String, default: "auto"
+ property :fstype, [String, nil], default: "auto"
- property :options, [Array, String],
+ property :options, [Array, String, nil],
coerce: proc { |arg| arg.kind_of?(String) ? arg.split(",") : arg },
default: %w{defaults}