Skip to content
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
2 changes: 1 addition & 1 deletion lib/puppet/provider/zfs/zfs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def container_property
end

[:aclinherit, :atime, :canmount, :checksum,
:compression, :copies, :dedup, :devices, :exec, :logbias,
:compression, :copies, :dedup, :defaultuserquota, :devices, :exec, :logbias,
:mountpoint, :nbmand, :primarycache, :quota, :readonly,
:recordsize, :refquota, :refreservation, :reservation,
:secondarycache, :setuid, :sharenfs, :sharesmb,
Expand Down
4 changes: 4 additions & 0 deletions lib/puppet/type/zfs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ module Puppet
desc 'The dedup property. Valid values are `on`, `off`.'
end

newproperty(:defaultuserquota) do
desc 'The defaultuserquota property. Valid values are `<size>`, `none`.'
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