X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Flvm%2Ftemplates%2Flvm.conf-stretch.erb;h=7392a4d123eb91a0edcec1415243cca90816f57b;hb=f8fb0964e63eee704ef5f7a4679f22e4f02e60f5;hp=feb491732529bd60159863f637736d31b0aed6da;hpb=e2b432a35530a1e7902d1acd61f60b62fefdf671;p=mirror%2Fdsa-puppet.git

diff --git a/modules/lvm/templates/lvm.conf-stretch.erb b/modules/lvm/templates/lvm.conf-stretch.erb
index feb491732..7392a4d12 100644
--- 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