diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-03-01 12:32:31 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-03-01 12:32:31 -0800 |
| commit | c1d7881c9255d6470fda7c27e800b4caa061b7c0 (patch) | |
| tree | 31a93324491705dd2e60fbc1d26fd22b9f3c4688 /lib | |
| parent | 026eba3a7b568e6ef7c8ea8032ea49c65dfd8295 (diff) | |
| parent | 9c0e55b43f6db69f060d54c894f2303ecbbe04e3 (diff) | |
| download | puppet-c1d7881c9255d6470fda7c27e800b4caa061b7c0.tar.gz puppet-c1d7881c9255d6470fda7c27e800b4caa061b7c0.tar.xz puppet-c1d7881c9255d6470fda7c27e800b4caa061b7c0.zip | |
Merge branch 'ticket/next/5496' into next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/zpool/solaris.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/puppet/provider/zpool/solaris.rb b/lib/puppet/provider/zpool/solaris.rb index e597c2ae1..758ea618a 100644 --- a/lib/puppet/provider/zpool/solaris.rb +++ b/lib/puppet/provider/zpool/solaris.rb @@ -19,11 +19,13 @@ Puppet::Type.type(:zpool).provide(:solaris) do pool_array.reverse.each do |value| sym = nil case value - when "spares"; sym = :spare - when "logs"; sym = :log - when "mirror", "raidz1", "raidz2" - sym = value == "mirror" ? :mirror : :raidz - pool[:raid_parity] = "raidz2" if value == "raidz2" + when "spares"; + sym = :spare + when "logs"; + sym = :log + when /^mirror|^raidz1|^raidz2/; + sym = value =~ /^mirror/ ? :mirror : :raidz + pool[:raid_parity] = "raidz2" if value =~ /^raidz2/ else tmp << value sym = :disk if value == pool_array.first |