osd: add possibility to exclude device in osd_auto_discovery

Add a new `osd_auto_discovery_exclude` to give the possibility of
excluding some devices in auto_discovery scenario.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 883bc1c2bd69a6e07cd1b95313375088a1e836db..3af140991e2a690c8bc06f112c336082c1e42c8a 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -370,6 +370,9 @@ dummy:
 #osd_mount_options_xfs: noatime,largeio,inode64,swalloc
 #osd_objectstore: bluestore
 
+# Any device containing these patterns in their path will be excluded.
+#osd_auto_discovery_exclude: ['dm-', 'loop']
+
 # xattrs. by default, 'filestore xattr use omap' is set to 'true' if
 # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can
 # be set to 'true' or 'false' to explicitly override those

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index d44c0965bcf94b93bb65120ca2ad15bbc81f9be4..281a6826cf9da88cb21e98f049ab7e73e1df8d1b 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -370,6 +370,9 @@ ceph_rhcs_version: 3
 #osd_mount_options_xfs: noatime,largeio,inode64,swalloc
 #osd_objectstore: bluestore
 
+# Any device containing these patterns in their path will be excluded.
+#osd_auto_discovery_exclude: ['dm-', 'loop']
+
 # xattrs. by default, 'filestore xattr use omap' is set to 'true' if
 # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can
 # be set to 'true' or 'false' to explicitly override those

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 58055c22f989038ff95f353251b9887101dc5e97..6dcec816c39f1601e7bd1fbb4f75bf0071a0291a 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -362,6 +362,9 @@ osd_mkfs_options_xfs: -f -i size=2048
 osd_mount_options_xfs: noatime,largeio,inode64,swalloc
 osd_objectstore: bluestore
 
+# Any device containing these patterns in their path will be excluded.
+osd_auto_discovery_exclude: ['dm-', 'loop']
+
 # xattrs. by default, 'filestore xattr use omap' is set to 'true' if
 # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can
 # be set to 'true' or 'false' to explicitly override those

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index 015eece3bc3c76746cccde638f54c16d6b2c8e25..2f8d6b5731fdf235f03da53c9df73b59a0f66154 100644 (file)
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -184,7 +184,7 @@
     - item.value.sectors != "0"
     - item.value.partitions|count == 0
     - item.value.holders|count == 0
-    - "'dm-' not in item.key"
+    - item.key not in osd_auto_discovery_exclude
 
 - name: set_fact ceph_uid for debian based system - non container
   set_fact: