From: Florian Haas <florian@hastexo.com>
Date: Thu, 21 Sep 2017 10:46:23 +0000 (+0200)
Subject: stable-2.2: docs: Mention OSD scenario booleans
X-Git-Tag: v2.2.12^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cef1bcc90508bab649dddeaf16893159facfc1c6;p=ceph-ansible.git

stable-2.2: docs: Mention OSD scenario booleans

In stable-2.2, no osd_scenario variable exists; instead, users must
set the boolean variables for the 6 different scenarios. Update
index.rst to that effect.
---

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 195f7b01b..2873b9926 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -116,7 +116,7 @@ An example configuration that deploys the upstream ``jewel`` version of ceph wit
     devices:
       - '/dev/sda'
       - '/dev/sdb'
-    osd_scenario: collocated
+    journal_collocation: true
     # use this to set your PG config for the cluster
     ceph_conf_overrides:
       global:
@@ -129,10 +129,18 @@ selection or other aspects of your cluster.
 - ``ceph_stable_release``
 - ``ceph_stable`` or ``ceph_rhcs`` or ``ceph_dev``
 - ``public_network``
-- ``osd_scenario``
 - ``journal_size``
 - ``monitor_interface`` or ``monitor_address``
 
+In addition, one of the OSD deployment scenarios must be set to ``true``. This can be one of:
+
+- ``journal_collocation``
+- ``raw_multi_journal``
+- ``osd_directory``
+- ``bluestore`` (must also set ``osd_objectstore`` to ``bluestore``, considered experimental in the ``jewel`` release)
+- ``dmcrypt_journal_collocation``
+- ``dmcrypt_dedicated_journal``
+
 ceph.conf Configuration
 -----------------------