summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/provider/zfs/solaris.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/puppet/provider/zfs/solaris.rb b/lib/puppet/provider/zfs/solaris.rb
index 4d382cfad..256e4e9b4 100644
--- a/lib/puppet/provider/zfs/solaris.rb
+++ b/lib/puppet/provider/zfs/solaris.rb
@@ -15,14 +15,6 @@ Puppet::Type.type(:zfs).provide(:solaris) do
properties
end
- def arrayify_second_line_on_whitespace(text)
- if second_line = text.split("\n")[1]
- second_line.split("\s")
- else
- []
- end
- end
-
def create
zfs *([:create] + add_properties + [@resource[:name]])
end
@@ -41,10 +33,7 @@ Puppet::Type.type(:zfs).provide(:solaris) do
[:mountpoint, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |field|
define_method(field) do
- #special knowledge of format
- #the command returns values in this format with the header
- #NAME PROPERTY VALUE SOURCE
- arrayify_second_line_on_whitespace(zfs(:get, field, @resource[:name]))[2]
+ zfs(:get, "-H", "-o", "value", field, @resource[:name]).strip
end
define_method(field.to_s + "=") do |should|