Merge remote branch 'someword/feature/master/5391' into next

* someword/feature/master/5391:
  (#5391) Include additional zfs properties

3 files changed, 22 insertions, 2 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 1757931f8..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
diff --git a/spec/unit/provider/zfs/solaris_spec.rb b/spec/unit/provider/zfs/solaris_spec.rb
index 75f1605cf..4998ba6fe 100755
--- a/spec/unit/provider/zfs/solaris_spec.rb
+++ b/spec/unit/provider/zfs/solaris_spec.rb
@@ -75,7 +75,7 @@ describe provider_class do
 
   end
 
-  [:mountpoint, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |prop|
+  [:mountpoint, :recordsize, :aclmode, :aclinherit, :primarycache, :secondarycache, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |prop|
     describe "when getting the #{prop} value" do
       it "should call zfs with :get, #{prop} and this zfs" do
         @provider.expects(:zfs).with(:get, "-H", "-o", "value", prop, @resource[:name]).returns("value\n")