From 701ade88c34b7ecd6d860329cae478422f7ffc9a Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 16 Dec 2019 15:12:47 -0500 Subject: [PATCH] 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 (cherry picked from commit 6f0556f01536932bdf47e8f1aab341b2c6761537) --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 265a823fe..861a7b5d0 100644 --- 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 380af37f3..d197aa9de 100644 --- 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 870cf039b..abeb75007 100644 --- 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 -- 2.39.5