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>
(cherry picked from commit 83d7ef777e)
pull/4834/head
Guillaume Abrioux 2019-02-11 13:52:37 +01:00
parent 690860affc
commit f6fea33b40
4 changed files with 10 additions and 1 deletions

View File

@ -372,6 +372,9 @@ dummy:
#osd_mount_options_xfs: noatime,largeio,inode64,swalloc #osd_mount_options_xfs: noatime,largeio,inode64,swalloc
#osd_objectstore: bluestore #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 # 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 # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can
# be set to 'true' or 'false' to explicitly override those # be set to 'true' or 'false' to explicitly override those

View File

@ -372,6 +372,9 @@ ceph_rhcs_version: 3
#osd_mount_options_xfs: noatime,largeio,inode64,swalloc #osd_mount_options_xfs: noatime,largeio,inode64,swalloc
#osd_objectstore: bluestore #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 # 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 # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can
# be set to 'true' or 'false' to explicitly override those # be set to 'true' or 'false' to explicitly override those

View File

@ -364,6 +364,9 @@ osd_mkfs_options_xfs: -f -i size=2048
osd_mount_options_xfs: noatime,largeio,inode64,swalloc osd_mount_options_xfs: noatime,largeio,inode64,swalloc
osd_objectstore: bluestore 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 # 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 # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can
# be set to 'true' or 'false' to explicitly override those # be set to 'true' or 'false' to explicitly override those

View File

@ -193,7 +193,7 @@
- item.value.sectors != "0" - item.value.sectors != "0"
- item.value.partitions|count == 0 - item.value.partitions|count == 0
- item.value.holders|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 - name: set_fact ceph_uid for debian based system - non container
set_fact: set_fact: