doc/cephadm: warn about default enabling `osd_memory_target_autotune`

Fixes: https://tracker.ceph.com/issues/51562
Signed-off-by: Melissa Li <melissali@redhat.com>

diff --git a/doc/cephadm/install.rst b/doc/cephadm/install.rst
index 95d65380afa11b6c44a2aec0f563d41842b8e713..1109f360a0902bb8c35a088b63076a9adcef3797 100644 (file)
--- a/doc/cephadm/install.rst
+++ b/doc/cephadm/install.rst
@@ -362,11 +362,14 @@ See :ref:`cephadm-deploy-osds` for more detailed instructions.
 Enabling OSD memory autotuning
 ------------------------------
 
-It is recommended to enable ``osd_memory_target_autotune``. 
-in order to maximise the performance of the cluster. See :ref:`osd_autotune`.
+.. warning:: By default, cephadm enables ``osd_memory_target_autotune`` on bootstrap, with ``mgr/cephadm/autotune_memory_target_ratio`` set to ``.7`` of total host memory.
 
-In case the cluster hardware is not exclusively used by Ceph (hyperconverged),
-reduce the memory consuption of Ceph like so:
+See :ref:`osd_autotune`.
+
+To deploy hyperconverged Ceph with TripleO, please refer to the TripleO documentation: `Scenario: Deploy Hyperconverged Ceph <https://docs.openstack.org/project-deploy-guide/tripleo-docs/latest/features/cephadm.html#scenario-deploy-hyperconverged-ceph>`_
+
+In other cases where the cluster hardware is not exclusively used by Ceph (hyperconverged),
+reduce the memory consumption of Ceph like so:
 
   .. prompt:: bash #
 

diff --git a/doc/cephadm/services/osd.rst b/doc/cephadm/services/osd.rst
index 32f50e2d47f24f0c488cb5ac4f22cec5c3a634b9..c96d8a510860fc8533e09124343c7c0476eb589e 100644 (file)
--- a/doc/cephadm/services/osd.rst
+++ b/doc/cephadm/services/osd.rst
@@ -380,9 +380,7 @@ memory with other services, cephadm can automatically adjust the per-OSD
 memory consumption based on the total amount of RAM and the number of deployed
 OSDs.
 
-This option is enabled globally with::
-
-  ceph config set osd osd_memory_target_autotune true
+.. warning:: Cephadm sets ``osd_memory_target_autotune`` to ``true`` by default which is unsuitable for hyperconverged infrastructures.
 
 Cephadm will start with a fraction
 (``mgr/cephadm/autotune_memory_target_ratio``, which defaults to