Give wuiet.d.o access to the ubc projectb replica

[mirror/dsa-puppet.git] / modules / lvm / templates / lvm.conf-stretch.erb

diff --git a/modules/lvm/templates/lvm.conf-stretch.erb b/modules/lvm/templates/lvm.conf-stretch.erb
index feb4917..7392a4d 100644 (file)
--- a/modules/lvm/templates/lvm.conf-stretch.erb
+++ b/modules/lvm/templates/lvm.conf-stretch.erb
@@ -149,6 +149,10 @@ devices {
        # global_filter are not opened by LVM.
        # This configuration option has an automatic default value.
        # global_filter = [ "a|.*/|" ]
+<% if @global_filter -%>
+       global_filter = <%= @global_filter -%>
+
+<% end -%>
 
        # Configuration option devices/cache_dir.
        # Directory in which to store the device cache file.
@@ -298,8 +302,14 @@ devices {
        # benefit from discards, but SSDs and thinly provisioned LUNs
        # generally do. If enabled, discards will only be issued if both the
        # storage and kernel provide support.
+<% if @issue_discards -%>
+       issue_discards = 1
+
+<% else -%>
        issue_discards = 0
 
+<% end -%>
+
        # Configuration option devices/allow_changes_with_duplicate_pvs.
        # Allow VG modification while a PV appears on multiple devices.
        # When a PV appears on multiple devices, LVM attempts to choose the