support forcing mixed vdev types

Author: h0tw1r3

lib/puppet/provider/zpool/zpool.rb

@@ -58,6 +58,10 @@ def process_zpool_data(pool_array)
       end
     end
 
+    if pool.key?(:mirror) && pool.key?(:raidz)
+      pool[:force] = true
+    end
+
     pool
   end
 
@@ -113,27 +117,38 @@ def build_vdevs
     mirror = @resource[:mirror]
     raidz = @resource[:raidz]
 
+    vdevs = []
+
     if disk
-      disk.map { |d| d.split(' ') }.flatten
-    elsif mirror
-      handle_multi_arrays('mirror', mirror)
-    elsif raidz
-      handle_multi_arrays(raidzarity, raidz)
+      vdevs << disk.map { |d| d.split(' ') }.flatten
+    else
+      if mirror
+        vdevs << handle_multi_arrays('mirror', mirror)
+      end
+      if raidz
+        vdevs << handle_multi_arrays(raidzarity, raidz)
+      end
     end
+
+    vdevs
   end
 
   def add_pool_properties
     properties = []
-    [:ashift, :autoexpand, :failmode].each do |property|
+    [:force, :ashift, :autoexpand, :failmode].each do |property|
       if (value = @resource[property]) && value != ''
-        properties << '-o' << "#{property}=#{value}"
+        if property == :force
+          properties << '-f'
+        else
+          properties << '-o' << "#{property}=#{value}"
+        end
       end
     end
     properties
   end
 
   def create
-    zpool(*([:create] + add_pool_properties + [@resource[:pool]] + build_vdevs + build_named('spare') + build_named('log') + build_named('cache')))
+    zpool(*([:create] + add_pool_properties + [@resource[:pool]] + build_vdevs.flatten + build_named('spare') + build_named('log') + build_named('cache')))
   end
 
   def destroy
@@ -148,7 +163,7 @@ def exists?
     end
   end
 
-  [:disk, :mirror, :raidz, :log, :spare, :cache, :raid_parity].each do |field|
+  [:disk, :mirror, :raidz, :log, :spare, :cache, :raid_parity, :force].each do |field|
     define_method(field) do
       current_pool[field]
     end

lib/puppet/type/zpool.rb

@@ -119,9 +119,18 @@ def insync?(is)
       desc 'Determines parity when using the `raidz` parameter.'
     end
 
+    newproperty(:force, boolean: false) do
+      desc "Forces use of vdevs, even if they appear in use or specify a conflicting replication level.
+      Not all devices can be overridden in this manner.
+      WARNING: this is an advanced option that should be used with caution! Ignores safety checks, may OVERWRITE DATA!"
+
+      defaultto false
+      newvalues(:true, :false)
+    end
+
     validate do
       has_should = [:disk, :mirror, :raidz].select { |prop| should(prop) }
-      raise _('You cannot specify %{multiple_props} on this type (only one)') % { multiple_props: has_should.join(' and ') } if has_should.length > 1
+      raise _('You cannot specify %{multiple_props} on this type (only one)') % { multiple_props: has_should.join(' and ') } if has_should.length > 1 && !should(:force)
     end
   end
 end

spec/unit/provider/zpool/zpool_spec.rb

@@ -179,6 +179,15 @@
         expect(pool[:raid_parity]).to eq('raidz3')
       end
     end
+
+    describe 'when there are mixed vdev replication levels' do
+      it 'calls create_multi_array with mirror and raidz1' do
+        zpool_data = ['mirrorpool', 'mirror-0', 'disk1', 'disk2', 'raidz1-1', 'disk3', 'disk4']
+        pool = provider.process_zpool_data(zpool_data)
+        expect(pool[:mirror]).to eq(['disk1 disk2'])
+        expect(pool[:raidz]).to eq(['disk3 disk4'])
+      end
+    end
   end
 
   describe 'when calling the getters and setters for configurable options' do
@@ -218,7 +227,7 @@
   end
 
   describe 'when calling the getters and setters' do
-    [:disk, :mirror, :raidz, :log, :spare, :cache, :raid_parity].each do |field|
+    [:disk, :mirror, :raidz, :log, :spare, :cache, :raid_parity, :force].each do |field|
       describe "when calling #{field}" do
         it "gets the #{field} value from the current_pool hash" do
           pool_hash = {}

spec/unit/type/zpool_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'zpool' do
-  describe Puppet::Type.type(:zpool) do
+  describe Puppet::Type.type(:zpool), type: :type do
     properties = [:ensure, :disk, :mirror, :raidz, :spare, :log, :autoexpand, :failmode, :ashift, :cache, :raid_parity]
     properties.each do |property|
       it "has a #{property} property" do
@@ -15,6 +15,16 @@
         expect(described_class.attrclass(parameter).ancestors).to be_include(Puppet::Parameter)
       end
     end
+
+    it 'is invalid when multiple vdev replications specified' do
+      expect {
+        described_class.new(name: 'dummy', disk: 'disk1', mirror: 'disk2 disk3')
+      }.to raise_error(RuntimeError, 'You cannot specify disk and mirror on this type (only one)')
+    end
+
+    it 'is valid when multiple vdev replications are forced' do
+      described_class.new(name: 'dummy', disk: 'disk1', mirror: 'disk2 disk3', force: true)
+    end
   end
 
   describe Puppet::Property::VDev do