MODULES-10620: Don't erase filesystem content and add force arg

Author: ahmet2mir

lib/puppet/provider/filesystem/lvm.rb

@@ -3,54 +3,68 @@
 
   confine kernel: :linux
 
-  commands blkid: 'blkid'
+  commands blkid: 'blkid',
+           findmnt: 'findmnt',
+           umount: 'umount'
 
   def create
-    mkfs(@resource[:fs_type], @resource[:name])
-  end
-
-  def exists?
-    fstype == @resource[:fs_type]
-  end
-
-  def destroy
-    # no-op
-  end
-
-  def fstype
-    %r{\bTYPE=\"(\S+)\"}.match(blkid(@resource[:name]))[1]
-  rescue Puppet::ExecutionFailure
-    nil
-  end
-
-  def mkfs(fs_type, name)
     mkfs_params = { 'reiserfs' => '-q', 'xfs' => '-f' }
 
     mkfs_cmd = !@resource[:mkfs_cmd].nil? ?
                  [@resource[:mkfs_cmd]] :
-               case fs_type
+               case @resource[:fs_type]
                when 'swap'
                  ['mkswap']
                else
-                 ["mkfs.#{fs_type}"]
+                 ["mkfs.#{@resource[:fs_type]}"]
                end
 
-    mkfs_cmd << name
+    mkfs_cmd << @resource[:name]
 
-    if mkfs_params[fs_type]
-      mkfs_cmd << mkfs_params[fs_type]
+    if mkfs_params[@resource[:fs_type]]
+      mkfs_cmd << mkfs_params[@resource[:fs_type]]
     end
 
     if resource[:options]
       mkfs_options = Array.new(resource[:options].split)
       mkfs_cmd << mkfs_options
     end
 
+    current_fs_type = fstype
+    unless current_fs_type.nil?
+      if @resource[:force] == :true || @resource[:force] == true || @resource[:force] == 'true'
+        umount(@resource[:name]) if mounted
+        info("#{@resource[:name]} will be umount and FS will be changed to #{@resource[:fs_type]} (currently #{current_fs_type})")
+      else
+        raise(Puppet::Error, "Changing FS type is destructive operation and it requires manual intervention (from #{current_fs_type} to #{@resource[:fs_type]}) or set force argument.")
+      end
+    end
+
     execute mkfs_cmd
-    if fs_type == 'swap'
+    if @resource[:fs_type] == 'swap'
       swap_cmd = ['swapon']
-      swap_cmd << name
+      swap_cmd << @resource[:name]
       execute swap_cmd
     end
   end
+
+  def destroy
+    # no-op
+  end
+
+  def exists?
+    fstype == @resource[:fs_type]
+  end
+
+  def fstype
+    %r{\bTYPE=\"(\S+)\"}.match(blkid(@resource[:name]))[1]
+  rescue Puppet::ExecutionFailure
+    nil
+  end
+
+  def mounted
+    findmnt('-rno', 'SOURCE', @resource[:name])
+  rescue Puppet::ExecutionFailure
+    false
+  end
 end

lib/puppet/type/filesystem.rb

@@ -148,4 +148,10 @@
       @parameters[:name].value
     end
   end
+
+  newparam(:force) do
+    desc 'Force the FS type even if the FS is mounted.'
+    defaultto :false
+    newvalues(:true, :false)
+  end
 end