MODULES-4753 Allow removal of swap LVMs

Added logic to the destroy method that will check blkid for the LVM's
type and run swapoff against it if it is of TYPE swap. This allows
swap LVMs to be removed rather than simply erroring out.

Author: David Hollinger

lib/puppet/provider/logical_volume/lvm.rb

@@ -129,6 +129,9 @@ def create
 
     def destroy
         name_escaped = "#{@resource[:volume_group].gsub('-','--')}-#{@resource[:name].gsub('-','--')}"
+        if blkid(path) =~ /\bTYPE=\"(swap)\"/
+            swapoff(path)
+        end
         dmsetup('remove', name_escaped)
         lvremove('-f', path)
     end

spec/unit/puppet/provider/logical_volume/lvm_spec.rb

@@ -228,18 +228,29 @@
 
   describe 'when destroying' do
     it "should execute 'dmsetup' and 'lvremove'" do
-      @resource.expects(:[]).with(:volume_group).returns('myvg').twice
-      @resource.expects(:[]).with(:name).returns('mylv').twice
+      @resource.expects(:[]).with(:volume_group).returns('myvg').times(3)
+      @resource.expects(:[]).with(:name).returns('mylv').times(3)
+      @provider.expects(:blkid).with('/dev/myvg/mylv')
       @provider.expects(:dmsetup).with('remove', 'myvg-mylv')
       @provider.expects(:lvremove).with('-f', '/dev/myvg/mylv')
       @provider.destroy
     end
     it "should execute 'dmsetup' and 'lvremove' and properly escape names with dashes" do
-      @resource.expects(:[]).with(:volume_group).returns('my-vg').twice
-      @resource.expects(:[]).with(:name).returns('my-lv').twice
+      @resource.expects(:[]).with(:volume_group).returns('my-vg').times(3)
+      @resource.expects(:[]).with(:name).returns('my-lv').times(3)
+      @provider.expects(:blkid).with('/dev/my-vg/my-lv')
       @provider.expects(:dmsetup).with('remove', 'my--vg-my--lv')
       @provider.expects(:lvremove).with('-f', '/dev/my-vg/my-lv')
       @provider.destroy
     end
+    it "should execute 'swapoff', 'dmsetup', and 'lvremove' when lvm is of type swap" do
+      @resource.expects(:[]).with(:volume_group).returns('myvg').times(4)
+      @resource.expects(:[]).with(:name).returns('mylv').times(4)
+      @provider.expects(:blkid).with('/dev/myvg/mylv').returns('TYPE="swap"')
+      @provider.expects(:swapoff).with('/dev/myvg/mylv')
+      @provider.expects(:dmsetup).with('remove', 'myvg-mylv')
+      @provider.expects(:lvremove).with('-f', '/dev/myvg/mylv')
+      @provider.destroy
+    end
   end
 end