Merge pull request #151 from ssgelm/resize_fs_flag

(MODULES-3230) Add flag to Logical_volume to not resize filesystem

Author: hunner

lib/puppet/provider/logical_volume/lvm.rb

@@ -188,15 +188,17 @@ def size=(new_size)
 
             lvextend( '-L', new_size, path) || fail( "Cannot extend to size #{new_size} because lvextend failed." )
 
-            blkid_type = blkid(path)
-            if command(:resize4fs) and blkid_type =~ /\bTYPE=\"(ext4)\"/
-              resize4fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
-            elsif blkid_type =~ /\bTYPE=\"(ext[34])\"/
-              resize2fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
-            elsif blkid_type =~ /\bTYPE=\"(xfs)\"/
-              xfs_growfs( path) || fail( "Cannot resize filesystem to size #{new_size} because xfs_growfs failed." )
-            elsif blkid_type =~ /\bTYPE=\"(swap)\"/
-              swapoff( path) && mkswap( path) && swapon( path) || fail( "Cannot resize swap to size #{new_size} because mkswap failed." )
+            unless @resource[:resize_fs] == :false or @resource[:resize_fs] == false or @resource[:resize_fs] == 'false'
+              blkid_type = blkid(path)
+              if command(:resize4fs) and blkid_type =~ /\bTYPE=\"(ext4)\"/
+                resize4fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
+              elsif blkid_type =~ /\bTYPE=\"(ext[34])\"/
+                resize2fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
+              elsif blkid_type =~ /\bTYPE=\"(xfs)\"/
+                xfs_growfs( path) || fail( "Cannot resize filesystem to size #{new_size} because xfs_growfs failed." )
+              elsif blkid_type =~ /\bTYPE=\"(swap)\"/
+                swapoff( path) && mkswap( path) && swapon( path) || fail( "Cannot resize swap to size #{new_size} because mkswap failed." )
+              end
             end
 
         end

lib/puppet/type/logical_volume.rb

@@ -135,6 +135,16 @@ def insync?(is)
     defaultto :false
   end
 
+  newparam(:resize_fs) do
+    desc "Whether or not to resize the underlying filesystem when resizing the logical volume."
+    validate do |value|
+      unless [:true, true, "true", :false, false, "false"].include?(value)
+        raise ArgumentError , "resize_fs must either be true or false"
+      end
+    end
+    defaultto :true
+  end
+
 
   newproperty(:mirror) do
       desc "The number of mirrors of the volume."

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

@@ -126,6 +126,34 @@
           @provider.expects(:blkid).with('/dev/myvg/mylv')
           @provider.size = '2000000k'
         end
+        context "with resize_fs flag" do
+          it "should execute 'blkid' if resize_fs is set to true" do
+            @resource.expects(:[]).with(:name).returns('mylv').at_least_once
+            @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
+            @resource.expects(:[]).with(:size).returns('1g').at_least_once
+            @resource.expects(:[]).with(:resize_fs).returns('true').at_least_once
+            @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
+            @provider.create
+            @provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once
+            @provider.expects(:lvs).with('--noheading', '-o', 'vg_extent_size', '--units', 'k', '/dev/myvg/mylv').returns(' 1000.00k')
+            @provider.expects(:lvextend).with('-L', '2000000k', '/dev/myvg/mylv').returns(true)
+            @provider.expects(:blkid).with('/dev/myvg/mylv')
+            @provider.size = '2000000k'
+          end
+          it "should not execute 'blkid' if resize_fs is set to false" do
+            @resource.expects(:[]).with(:name).returns('mylv').at_least_once
+            @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
+            @resource.expects(:[]).with(:size).returns('1g').at_least_once
+            @resource.expects(:[]).with(:resize_fs).returns('false').at_least_once
+            @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
+            @provider.create
+            @provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once
+            @provider.expects(:lvs).with('--noheading', '-o', 'vg_extent_size', '--units', 'k', '/dev/myvg/mylv').returns(' 1000.00k')
+            @provider.expects(:lvextend).with('-L', '2000000k', '/dev/myvg/mylv').returns(true)
+            @provider.expects(:blkid).with('/dev/myvg/mylv').never
+            @provider.size = '2000000k'
+          end
+        end
       end
       context "not in extent portions" do
         it "should raise an exception" do