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 265a823fea3ab8aaa5423f84974aa416b86d794f..861a7b5d0cbd49df969e78a3021d970c2b60a785 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -382,7 +382,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 380af37f385d3c8cf3e58f7b51dccc7de39f257e..d197aa9de07eace57b16ff8ad9a1f2cd465b735e 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -382,7 +382,7 @@ ceph_iscsi_config_dev: false
 #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 870cf039b10aa43b9c66e0720d17bbe1b6e7730c..abeb7500709e39f2c5f61d74880fa98cd7e319ef 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -374,7 +374,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