summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDerek Olsen <derek.olsen@e-hps.com>2010-11-24 11:11:43 -0800
committerDerek Olsen <derek.olsen@e-hps.com>2010-11-24 11:11:43 -0800
commitc5a1ca0b34a57366415df60099ab0918a7579469 (patch)
treed680ebdece98e6e459c4e3a56f72c776b4bd7834 /lib
parentd5db8db116aff58215ab0feebd7ec02086040f51 (diff)
downloadpuppet-c5a1ca0b34a57366415df60099ab0918a7579469.tar.gz
puppet-c5a1ca0b34a57366415df60099ab0918a7579469.tar.xz
puppet-c5a1ca0b34a57366415df60099ab0918a7579469.zip
(#5391) Include additional zfs properties
We added the following zfs properties to the zfs provider :recordsize, :aclmode, :aclinherit, :primarycache, :secondarycache Currently zfs users have to chain an exec to the zfs filesystem creation and the inclusion of these properties would allow puppet to set them natively.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/provider/zfs/solaris.rb2
-rwxr-xr-xlib/puppet/type/zfs.rb23
2 files changed, 22 insertions, 3 deletions
diff --git a/lib/puppet/provider/zfs/solaris.rb b/lib/puppet/provider/zfs/solaris.rb
index 85d054f86..9aec9d801 100644
--- a/lib/puppet/provider/zfs/solaris.rb
+++ b/lib/puppet/provider/zfs/solaris.rb
@@ -31,7 +31,7 @@ Puppet::Type.type(:zfs).provide(:solaris) do
end
end
- [:mountpoint, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |field|
+ [:mountpoint, :recordsize, :aclmode, :aclinherit, :primarycache, :secondarycache, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |field|
define_method(field) do
zfs(:get, "-H", "-o", "value", field, @resource[:name]).strip
end
diff --git a/lib/puppet/type/zfs.rb b/lib/puppet/type/zfs.rb
index e1a972ddf..be18ab5aa 100755
--- a/lib/puppet/type/zfs.rb
+++ b/lib/puppet/type/zfs.rb
@@ -12,6 +12,26 @@ module Puppet
desc "The mountpoint property."
end
+ newproperty(:recordsize) do
+ desc "The recordsize property."
+ end
+
+ newproperty(:aclmode) do
+ desc "The aclmode property."
+ end
+
+ newproperty(:aclinherit) do
+ desc "The aclinherit property."
+ end
+
+ newproperty(:primarycache) do
+ desc "The primarycache property."
+ end
+
+ newproperty(:secondarycache) do
+ desc "The secondarycache property."
+ end
+
newproperty(:compression) do
desc "The compression property."
end
@@ -33,7 +53,7 @@ module Puppet
end
newproperty(:snapdir) do
- desc "The sharenfs property."
+ desc "The snapdir property."
end
autorequire(:zpool) do
@@ -48,4 +68,3 @@ module Puppet
end
end
end
-