ceph-defaults: exclude rbd devices from discovery

The RBD devices aren't excluded from the devices list in the LVM auto
discovery scenario.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1783908
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 6f0556f01536932bdf47e8f1aab341b2c6761537)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index ac7f24433f05bc97db739de5bda1ef12197ae8d1..3703c5614e6330b3d06cc76aa4b40e11b1883b84 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -373,7 +373,7 @@ dummy:
 #osd_objectstore: bluestore
 
 # Any device containing these patterns in their path will be excluded.
-#osd_auto_discovery_exclude: "dm-*|loop*|md*"
+#osd_auto_discovery_exclude: "dm-*|loop*|md*|rbd*"
 
 # 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

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 093a40be53851efe1860695ae27a2eaa16d13986..dbef7afb376c0a7eacf43fffcaf81864a6f2735f 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -373,7 +373,7 @@ ceph_rhcs_version: 3
 #osd_objectstore: bluestore
 
 # Any device containing these patterns in their path will be excluded.
-#osd_auto_discovery_exclude: "dm-*|loop*|md*"
+#osd_auto_discovery_exclude: "dm-*|loop*|md*|rbd*"
 
 # 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

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index e9f633205802e4951a24026261754be367ce2f64..014406067118fcbe3ed0514fc977c6ff0d0e6bff 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -365,7 +365,7 @@ 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*|md*"
+osd_auto_discovery_exclude: "dm-*|loop*|md*|rbd*"
 
 # 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