mirror of https://github.com/ceph/ceph-ansible.git
facts: fix auto_discovery exclude
the previous approach was wrong.
checking if `item.key` is in `osd_auto_discovery_exclude` (`['dm-',
'loop']`) is incorrect because it will obviously not match. Therefore,
the condition will return `True` whatever the device we are checking.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 8f42007272
)
pull/4834/head
parent
f6fea33b40
commit
4f6925890c
|
@ -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']
|
||||
#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
|
||||
|
|
|
@ -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']
|
||||
#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
|
||||
|
|
|
@ -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']
|
||||
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
|
||||
|
|
|
@ -193,7 +193,7 @@
|
|||
- item.value.sectors != "0"
|
||||
- item.value.partitions|count == 0
|
||||
- item.value.holders|count == 0
|
||||
- item.key not in osd_auto_discovery_exclude
|
||||
- item.key is not match osd_auto_discovery_exclude
|
||||
|
||||
- name: set_fact ceph_uid for debian based system - non container
|
||||
set_fact:
|
||||
|
|
Loading…
Reference in New Issue