Merge pull request #386 from etiennedub/fix_quota_again

Fix quota condition
ComputeCanada · Oct 1, 2024 · 4c34f51 · 4c34f51
2 parents ef3e870 + f5c6f8d
commit 4c34f51
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/site/profile/manifests/volumes.pp b/site/profile/manifests/volumes.pp
@@ -42,7 +42,7 @@
           enable_resize => pick($values['enable_resize'], false),
           filesystem    => pick($values['filesystem'], 'xfs'),
           require       => File["/mnt/${volume_tag}"],
-          quota         => pick($values['quota'], nil),
+          quota         => pick_default($values['quota'], undef),
         }
       }
     }
@@ -94,10 +94,10 @@
     followsymlinks   => true,
   }
 
-  if $filesystem == 'xfs' and $quota {
+  if $filesystem == 'xfs' {
     $options = 'defaults,usrquota'
   } else {
-    $options = ''
+    $options = 'defaults'
   }
 
   lvm::logical_volume { $name:
@@ -170,7 +170,7 @@
     }
   }
 
-  if $filesystem == 'xfs' and $quota {
+  if $filesystem == 'xfs' and $quota != undef {
     # Save the xfs quota setting to avoid applying at every iteration
     file { "/etc/xfs_quota/${volume_tag}-${volume_name}":
       ensure  => 'file',