X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Flvm%2Ftemplates%2Flvm.conf-buster.erb;h=fe17ea969bf1f23bd7b8eadee267a2426ebb9bc4;hb=9a69220cc9cf9388a8336e0c4fd65489e8933367;hp=f2bcf0235efba8f958ea3d5f892b57ef593282b6;hpb=e2b432a35530a1e7902d1acd61f60b62fefdf671;p=mirror%2Fdsa-puppet.git

diff --git a/modules/lvm/templates/lvm.conf-buster.erb b/modules/lvm/templates/lvm.conf-buster.erb
index f2bcf0235..fe17ea969 100644
--- a/modules/lvm/templates/lvm.conf-buster.erb
+++ b/modules/lvm/templates/lvm.conf-buster.erb
@@ -148,6 +148,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/types.
 	# List of additional acceptable block device types.
@@ -282,8 +286,13 @@ 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