diff options
| author | Andrew Shafer <andrew@reductivelabs.com> | 2008-12-07 22:41:45 -0700 |
|---|---|---|
| committer | Andrew Shafer <andrew@reductivelabs.com> | 2008-12-08 00:07:54 -0700 |
| commit | 7e2da7eeb25bb8879af40f12c4a04047a159374e (patch) | |
| tree | 2dbc7e7762355791c4d38b5b14bc9fe28d67bf6b /lib/puppet | |
| parent | 8616d74b47ac9177a3f29f1ebf63902bdefb3275 (diff) | |
| download | puppet-7e2da7eeb25bb8879af40f12c4a04047a159374e.tar.gz puppet-7e2da7eeb25bb8879af40f12c4a04047a159374e.tar.xz puppet-7e2da7eeb25bb8879af40f12c4a04047a159374e.zip | |
Refactor #1802 Use 'zfs get -H -o value' instead of parsing output for value
just simplifying code
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/provider/zfs/solaris.rb | 13 |
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| |