Skip to content

(PA-5790) Add zfs attribute defaultuserquota #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ The copies property. Valid values are `1`, `2`, `3`.

The dedup property. Valid values are `on`, `off`.

##### `defaultuserquota`

The defaultuserquota property. Valid values are `<size>`, `none`.

##### `devices`

The devices property. Valid values are `on`, `off`.
Expand Down
3 changes: 2 additions & 1 deletion lib/puppet/provider/zfs/zfs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ def container_property
# aclmode was removed from S11 in build 139 but it may have been added back
# acltype is for ZFS on Linux, and allows disabling or enabling POSIX ACLs
# http://webcache.googleusercontent.com/search?q=cache:-p74K0DVsdwJ:developers.slashdot.org/story/11/11/09/2343258/solaris-11-released+&cd=13
[:aclmode, :acltype, :shareiscsi, :overlay].each do |field|
# defaultuserquota is not supported in zfs filesystem versions older than 6 and will error on Solaris 10 machines
[:aclmode, :acltype, :shareiscsi, :overlay, :defaultuserquota].each do |field|
# The zfs commands use the property value '-' to indicate that the
# property is not set. We make use of this value to indicate that the
# property is not set since it is not available. Conversely, if these
Expand Down
10 changes: 10 additions & 0 deletions lib/puppet/type/zfs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ module Puppet
desc 'The dedup property. Valid values are `on`, `off`.'
end

newproperty(:defaultuserquota) do
desc 'The defaultuserquota property. Valid values are `<size>`, `none`.'

# Solaris 10 uses zfs filesystem version 5 which doesn't support defaultuserquota
validate do |_value|
raise Puppet::Error _('This property is only supported on zfs filestystem version >= 6') if Facter.value(:kernel) == 'SunOS' && Puppet::Util::Package.versioncmp(Facter.value(:kernelrelease),
'11') < 0
end
end

newproperty(:devices) do
desc 'The devices property. Valid values are `on`, `off`.'
end
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/provider/zfs/zfs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

describe 'zfs properties' do
[:aclinherit, :aclmode, :atime, :canmount, :checksum,
:compression, :copies, :dedup, :devices, :exec, :logbias,
:compression, :copies, :dedup, :defaultuserquota, :devices, :exec, :logbias,
:mountpoint, :nbmand, :overlay, :primarycache, :quota, :readonly,
:recordsize, :refquota, :refreservation, :reservation,
:secondarycache, :setuid, :shareiscsi, :sharenfs, :sharesmb,
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/type/zfs_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'spec_helper'

describe Puppet::Type.type(:zfs) do
properties = [:ensure, :mountpoint, :compression, :copies, :overlay, :quota, :reservation, :sharenfs, :snapdir, :sync]
properties = [:ensure, :mountpoint, :compression, :copies, :overlay, :quota, :defaultuserquota, :reservation, :sharenfs, :snapdir, :sync]

properties.each do |property|
it "has a #{property} property" do
Expand Down