Merge pull request #152 from MemberIT/bugfix/remove_swap_partition

hunner · web-flow · commit 5b3632a5313f · 2016-08-25T10:23:03.000-07:00
fixed: executed command 'swapoff' before unmount swap partion.
diff --git a/manifests/logical_volume.pp b/manifests/logical_volume.pp
@@ -103,10 +103,10 @@
         }
       } 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",
-          subscribe => Mount[$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 {

Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,10 @@`
`103`	`103`	`}`
`104`	`104`	`} else {`
`105`	`105`	`exec { "swapoff for '${mount_title}'":`
`106`		`- path => [ '/bin', '/usr/bin', '/sbin' ],`
`107`		`- command => "swapoff ${lvm_device_path}",`
`108`		- onlyif => "grep `readlink -f ${lvm_device_path}` /proc/swaps",
`109`		`- subscribe => Mount[$mount_title],`
	`106`	`+ path => [ '/bin', '/usr/bin', '/sbin' ],`
	`107`	`+ command => "swapoff ${lvm_device_path}",`
	`108`	+ onlyif => "grep `readlink -f ${lvm_device_path}` /proc/swaps",
	`109`	`+ notify => Mount[$mount_title],`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`} else {`