MODULES-4753 Remove redundant swap exec resources

The exec resources running swapon and swapoff in the lvm::logical_volume
define type were running whenever a swap logical volume was created
or updated.

The logical_volume provider was also running these same commands on a swap
resize. This caused a conflict where the puppet run would error out
when the logical_volume provider attempted to run swapoff on a swap
lvm that had already been unloaded from swap and the lvm would never
be reloaded into swap.

Author: David Hollinger

manifests/logical_volume.pp

@@ -101,30 +101,13 @@
   }
 
   if $createfs or $ensure != 'present' {
-    if $fs_type == 'swap' {
-      if $ensure == 'present' {
-        exec { "swapon for '${mount_title}'":
-          path      => [ '/bin', '/usr/bin', '/sbin' ],
-          command   => "swapon ${lvm_device_path}",
-          unless    => "grep `readlink -f ${lvm_device_path}` /proc/swaps",
-          subscribe => Mount[$mount_title],
-        }
-      } else {
-        exec { "swapoff for '${mount_title}'":
-          path    => [ '/bin', '/usr/bin', '/sbin' ],
-          command => "swapoff ${lvm_device_path}",
-          onlyif  => "grep `readlink -f ${lvm_device_path}` /proc/swaps",
-          notify  => Mount[$mount_title],
-        }
-      }
-    } else {
-      exec { "ensure mountpoint '${fixed_mountpath}' exists":
-        path    => [ '/bin', '/usr/bin' ],
-        command => "mkdir -p ${fixed_mountpath}",
-        unless  => "test -d ${fixed_mountpath}",
-        before  => Mount[$mount_title],
-      }
+    exec { "ensure mountpoint '${fixed_mountpath}' exists":
+      path    => [ '/bin', '/usr/bin' ],
+      command => "mkdir -p ${fixed_mountpath}",
+      unless  => "test -d ${fixed_mountpath}",
+      before  => Mount[$mount_title],
     }
+
     mount { $mount_title:
       ensure  => $mount_ensure,
       name    => $fixed_mountpath,

spec/unit/classes/lvm_spec.rb

@@ -111,10 +111,5 @@
       :pass   => 0,
       :dump   => 0
     }) }
-    it { should contain_exec("swapon for '/dev/myvg/swap'") }
-    it { should_not contain_exec("ensure mountpoint 'swap_/dev/myvg/swap' exists") }
-
-    it { should contain_exec("swapoff for '/dev/myvg/swap2'") }
-    it { should_not contain_exec("ensure mountpoint 'swap_/dev/myvg/swap2' exists") }
   end
 end