manifests/logical_volume.pp, add support for filesystem-labels

Author: Andreas Unterkircher

manifests/logical_volume.pp

@@ -14,6 +14,7 @@
   Boolean $mountpath_require         = false,
   Boolean $mounted                   = true,
   Boolean $createfs                  = true,
+  Boolean $use_fs_label              = false,
   $extents                           = undef,
   $stripes                           = undef,
   $stripesize                        = undef,
@@ -32,23 +33,34 @@
 
   $lvm_device_path = "/dev/${volume_group}/${name}"
 
+  $mount_device = $use_fs_label ? {
+    false => $lvm_device_path,
+    true  => "LABEL=${name}",
+  }
+
+  $mkfs_label = $use_fs_label ? {
+    false => '',
+    # the ending whitespace is required
+    true  => "-L ${name} ",
+  }
+
   if $mountpath_require and $fs_type != 'swap' {
     Mount {
       require => File[$mountpath],
     }
   }
 
   if $fs_type == 'swap' {
-    $mount_title     = $lvm_device_path
-    $fixed_mountpath = "swap_${lvm_device_path}"
+    $mount_title     = $mount_device
+    $fixed_mountpath = "swap_${mount_device}"
     $fixed_pass      = 0
     $fixed_dump      = 0
     $mount_ensure    = $ensure ? {
       'absent' => absent,
       default  => present,
     }
   } else {
-    $mount_title     = $mountpath
+    $mount_title     = $mount_device
     $fixed_mountpath = $mountpath
     $fixed_pass      = $pass
     $fixed_dump      = $dump
@@ -96,7 +108,7 @@
     filesystem { $lvm_device_path:
       ensure  => $ensure,
       fs_type => $fs_type,
-      options => $mkfs_options,
+      options => "${mkfs_label}${mkfs_options}",
     }
   }
 
@@ -113,7 +125,7 @@
     mount { $mount_title:
       ensure  => $mount_ensure,
       name    => $fixed_mountpath,
-      device  => $lvm_device_path,
+      device  => $mount_device,
       fstype  => $fs_type,
       options => $options,
       pass    => $fixed_pass,