Skip to content

Commit

Permalink
Merge pull request #82 from shubhamshinde360/maint/defaultuserquota_l…
Browse files Browse the repository at this point in the history
…inux

Revert "add zfs attribute defaultuserquota"
  • Loading branch information
AriaXLi authored Jun 25, 2024
2 parents 718a9d7 + a979d5b commit b8e4d77
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 11 deletions.
4 changes: 0 additions & 4 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ 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, :defaultuserquota, :devices, :exec, :logbias,
:compression, :copies, :dedup, :devices, :exec, :logbias,
:mountpoint, :nbmand, :primarycache, :quota, :readonly,
:recordsize, :refquota, :refreservation, :reservation,
:secondarycache, :setuid, :sharenfs, :sharesmb,
Expand Down
4 changes: 0 additions & 4 deletions lib/puppet/type/zfs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ 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, :defaultuserquota, :devices, :exec, :logbias,
:compression, :copies, :dedup, :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, :defaultuserquota, :reservation, :sharenfs, :snapdir, :sync]
properties = [:ensure, :mountpoint, :compression, :copies, :overlay, :quota, :reservation, :sharenfs, :snapdir, :sync]

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

0 comments on commit b8e4d77

Please sign in to comment.