From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 28 Mar 2018 20:40:04 +0000 (-0400)
Subject: ceph-osd note that some scenarios use ceph-disk vs. ceph-volume
X-Git-Tag: v3.0.29~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7c6eb4a8aa0f084e8021dcc2dbb9bd51f6db1f2a;p=ceph-ansible.git

ceph-osd note that some scenarios use ceph-disk vs. ceph-volume

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 3fcf966803e35d7ba30e7c1b0ba78db94c664594)
Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 29385ef69..d32b5eb8a 100644
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -71,6 +71,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
 
 #devices:
 #  - /dev/sdb
@@ -115,6 +116,7 @@ dummy:
 # /dev/sda1: UUID="9c43e346-dd6e-431f-92d8-cbed4ccb25f6" TYPE="xfs" PARTLABEL="ceph data" PARTUUID="749c71c9-ed8f-4930-82a7-a48a3bcdb1c7"
 # /dev/sda2: PARTLABEL="ceph block" PARTUUID="e6ca3e1d-4702-4569-abfa-e285de328e9d"
 #
+# Note: This scenario uses the ceph-disk tool to provision OSDs
 
 #osd_scenario: "{{ 'collocated' if journal_collocation or dmcrypt_journal_collocation else 'non-collocated' if raw_multi_journal or dmcrypt_dedicated_journal else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
 #valid_osd_scenarios:
@@ -175,6 +177,8 @@ dummy:
 # /dev/sdb: PTTYPE="gpt"
 # /dev/sdb1: PARTLABEL="ceph block.db" PARTUUID="af5b2d74-4c08-42cf-be57-7248c739e217"
 # /dev/sdb2: PARTLABEL="ceph block.wal" PARTUUID="af3f8327-9aa9-4c2b-a497-cf0fe96d126a"
+#
+# Note: This scenario uses the ceph-disk tool to provision OSDs
 #dedicated_devices: "{{ raw_journal_devices if raw_multi_journal or dmcrypt_dedicated_journal else [] }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
 
 
@@ -194,6 +198,7 @@ dummy:
 # /dev/sdb1: PARTLABEL="ceph block.db" PARTUUID="0734f6b6-cc94-49e9-93de-ba7e1d5b79e3"
 # /dev/sdc: PTTYPE="gpt"
 # /dev/sdc1: PARTLABEL="ceph block.wal" PARTUUID="824b84ba-6777-4272-bbbd-bfe2a25cecf3"
+# Note: This option uses the ceph-disk tool
 #bluestore_wal_devices: "{{ dedicated_devices }}"
 
 # III. Use ceph-volume to create OSDs from logical volumes.
diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index ab0c95d65..e3cbcd88d 100644
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -63,6 +63,7 @@ osd_crush_location: "\"root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} hos
 
 # 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
 
 #devices:
 #  - /dev/sdb
@@ -107,6 +108,7 @@ dmcrypt: "{{ True if dmcrypt_journal_collocation or dmcrypt_dedicated_journal el
 # /dev/sda1: UUID="9c43e346-dd6e-431f-92d8-cbed4ccb25f6" TYPE="xfs" PARTLABEL="ceph data" PARTUUID="749c71c9-ed8f-4930-82a7-a48a3bcdb1c7"
 # /dev/sda2: PARTLABEL="ceph block" PARTUUID="e6ca3e1d-4702-4569-abfa-e285de328e9d"
 #
+# Note: This scenario uses the ceph-disk tool to provision OSDs
 
 osd_scenario: "{{ 'collocated' if journal_collocation or dmcrypt_journal_collocation else 'non-collocated' if raw_multi_journal or dmcrypt_dedicated_journal else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
 valid_osd_scenarios:
@@ -167,6 +169,8 @@ valid_osd_scenarios:
 # /dev/sdb: PTTYPE="gpt"
 # /dev/sdb1: PARTLABEL="ceph block.db" PARTUUID="af5b2d74-4c08-42cf-be57-7248c739e217"
 # /dev/sdb2: PARTLABEL="ceph block.wal" PARTUUID="af3f8327-9aa9-4c2b-a497-cf0fe96d126a"
+#
+# Note: This scenario uses the ceph-disk tool to provision OSDs
 dedicated_devices: "{{ raw_journal_devices if raw_multi_journal or dmcrypt_dedicated_journal else [] }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
 
 
@@ -186,6 +190,7 @@ dedicated_devices: "{{ raw_journal_devices if raw_multi_journal or dmcrypt_dedic
 # /dev/sdb1: PARTLABEL="ceph block.db" PARTUUID="0734f6b6-cc94-49e9-93de-ba7e1d5b79e3"
 # /dev/sdc: PTTYPE="gpt"
 # /dev/sdc1: PARTLABEL="ceph block.wal" PARTUUID="824b84ba-6777-4272-bbbd-bfe2a25cecf3"
+# Note: This option uses the ceph-disk tool
 bluestore_wal_devices: "{{ dedicated_devices }}"
 
 # III. Use ceph-volume to create OSDs from logical volumes.