From a33791be25ad6b067dfe39c64b84f2c7d7998161 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 21 Aug 2019 11:10:29 +0200 Subject: [PATCH] osd: update doc text in defaults/main.yml This commit removes ceph-disk references. Signed-off-by: Guillaume Abrioux (cherry picked from commit 70f1b37097b24edadad49158713fccb94b57c43e) --- group_vars/osds.yml.sample | 8 ++++---- roles/ceph-osd/defaults/main.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample index 231fab646..68ab3ddab 100644 --- a/group_vars/osds.yml.sample +++ b/group_vars/osds.yml.sample @@ -31,7 +31,7 @@ dummy: # Declare devices to be used as OSDs # All scenario(except 3rd) inherit from the following device declaration -# Note: This scenario uses the ceph-disk tool to provision OSDs +# Note: This scenario uses the ceph-volume lvm batch method to provision OSDs #devices: # - /dev/sdb @@ -51,9 +51,9 @@ dummy: #'osd_auto_discovery' mode prevents you from filling out the 'devices' variable above. # Device discovery is based on the Ansible fact 'ansible_devices' -# which reports all the devices on a system. If chosen all the disks -# found will be passed to ceph-disk. You should not be worried on using -# this option since ceph-disk has a built-in check which looks for empty devices. +# which reports all the devices on a system. If chosen, all the disks +# found will be passed to ceph-volume lvm batch. You should not be worried on using +# this option since ceph-volume has a built-in check which looks for empty devices. # Thus devices with existing partition tables will not be used. # #osd_auto_discovery: false diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml index 856f4ae1e..3c4b9b5ad 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -23,7 +23,7 @@ copy_admin_key: false # Declare devices to be used as OSDs # All scenario(except 3rd) inherit from the following device declaration -# Note: This scenario uses the ceph-disk tool to provision OSDs +# Note: This scenario uses the ceph-volume lvm batch method to provision OSDs #devices: # - /dev/sdb @@ -43,9 +43,9 @@ dedicated_devices: [] #'osd_auto_discovery' mode prevents you from filling out the 'devices' variable above. # Device discovery is based on the Ansible fact 'ansible_devices' -# which reports all the devices on a system. If chosen all the disks -# found will be passed to ceph-disk. You should not be worried on using -# this option since ceph-disk has a built-in check which looks for empty devices. +# which reports all the devices on a system. If chosen, all the disks +# found will be passed to ceph-volume lvm batch. You should not be worried on using +# this option since ceph-volume has a built-in check which looks for empty devices. # Thus devices with existing partition tables will not be used. # osd_auto_discovery: false