X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdsa_lvm%2Ffiles%2Flvm-ganeti.manda.debian.org.conf;h=9bcd78a7a117ded69aaa0ec14638da724aa66de2;hb=45051a04bcdc18d3ebafd00d20369d8060d7b97a;hp=feb491732529bd60159863f637736d31b0aed6da;hpb=cfa014c82fd371f1e062928aa95ff6f89737d422;p=mirror%2Fdsa-puppet.git

diff --git a/modules/dsa_lvm/files/lvm-ganeti.manda.debian.org.conf b/modules/dsa_lvm/files/lvm-ganeti.manda.debian.org.conf
index feb491732..9bcd78a7a 100644
--- a/modules/dsa_lvm/files/lvm-ganeti.manda.debian.org.conf
+++ b/modules/dsa_lvm/files/lvm-ganeti.manda.debian.org.conf
@@ -139,6 +139,7 @@ devices {
 	# 
 	# This configuration option has an automatic default value.
 	# filter = [ "a|.*/|" ]
+	filter = [ "a|^/dev/sd[ab][0-9]*$|", "r/.*/" ]
 
 	# Configuration option devices/global_filter.
 	# Limit the block devices that are used by LVM system components.
@@ -149,6 +150,7 @@ devices {
 	# global_filter are not opened by LVM.
 	# This configuration option has an automatic default value.
 	# global_filter = [ "a|.*/|" ]
+	global_filter = [ "a|^/dev/sd[ab][0-9]*$|", "r/.*/" ]
 
 	# Configuration option devices/cache_dir.
 	# Directory in which to store the device cache file.
@@ -298,7 +300,7 @@ 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.
-	issue_discards = 0
+	issue_discards = 1
 
 	# Configuration option devices/allow_changes_with_duplicate_pvs.
 	# Allow VG modification while a PV appears on multiple devices.