Skip to content

Commit e16b1c2

Browse files
authored
Merge pull request #63 from eg-roberts/attribute-defaultuserquota
MODULES-11423: add zfs attribute defaultuserquota
2 parents 9668c4a + cb3f040 commit e16b1c2

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

REFERENCE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ The copies property. Valid values are `1`, `2`, `3`.
6767

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

70+
##### `defaultuserquota`
71+
72+
The defaultuserquota property. Valid values are `<size>`, `none`.
73+
7074
##### `devices`
7175

7276
The devices property. Valid values are `on`, `off`.

lib/puppet/provider/zfs/zfs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def container_property
7676
end
7777

7878
[:aclinherit, :atime, :canmount, :checksum,
79-
:compression, :copies, :dedup, :devices, :exec, :logbias,
79+
:compression, :copies, :dedup, :defaultuserquota, :devices, :exec, :logbias,
8080
:mountpoint, :nbmand, :primarycache, :quota, :readonly,
8181
:recordsize, :refquota, :refreservation, :relatime, :reservation,
8282
:secondarycache, :setuid, :sharenfs, :sharesmb,

lib/puppet/type/zfs.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ module Puppet
5656
desc 'The dedup property. Valid values are `on`, `off`.'
5757
end
5858

59+
newproperty(:defaultuserquota) do
60+
desc 'The defaultuserquota property. Valid values are `<size>`, `none`.'
61+
end
62+
5963
newproperty(:devices) do
6064
desc 'The devices property. Valid values are `on`, `off`.'
6165
end

spec/unit/provider/zfs/zfs_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191

9292
describe 'zfs properties' do
9393
[:aclinherit, :aclmode, :atime, :canmount, :checksum,
94-
:compression, :copies, :dedup, :devices, :exec, :logbias,
94+
:compression, :copies, :dedup, :defaultuserquota, :devices, :exec, :logbias,
9595
:mountpoint, :nbmand, :overlay, :primarycache, :quota, :readonly,
9696
:recordsize, :refquota, :refreservation, :reservation,
9797
:secondarycache, :setuid, :shareiscsi, :sharenfs, :sharesmb,

spec/unit/type/zfs_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper'
22

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

66
properties.each do |property|
77
it "has a #{property} property" do

0 commit comments

Comments
 (0)