From d2c56071ae81920c125dba8334e16001d79232e9 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 18 Feb 2021 15:08:44 +0100
Subject: [PATCH] doc/cephadm: move unmanaged=true to service-mgmt.rst

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 31470cfd5c04011dc69c106a921fc4dbf561ce46)
---
 doc/cephadm/operations.rst         | 61 -----------------------------
 doc/cephadm/service-management.rst | 62 ++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/doc/cephadm/operations.rst b/doc/cephadm/operations.rst
index 00955abe9794c..5433303eb21da 100644
--- a/doc/cephadm/operations.rst
+++ b/doc/cephadm/operations.rst
@@ -217,64 +217,3 @@ Then, run bootstrap referencing this file::
 
   cephadm bootstrap -c /root/ceph.conf ...
 
-
-.. _cephadm-spec-unmanaged:
-
-Disable automatic deployment of daemons
-=======================================
-
-Cephadm supports disabling the automated deployment and removal of daemons per service. In
-this case, the CLI supports two commands that are dedicated to this mode. 
-
-To disable the automatic management of dameons, apply
-the :ref:`orchestrator-cli-service-spec` with ``unmanaged=True``. 
-
-``mgr.yaml``:
-
-.. code-block:: yaml
-
-  service_type: mgr
-  unmanaged: true
-  placement:
-    label: mgr
-
-.. code-block:: bash
-
-  ceph orch apply -i mgr.yaml
-
-.. note::
-
-  cephadm will no longer deploy any new daemons, if the placement
-  specification matches additional hosts.
-
-To manually deploy a daemon on a host, please execute:
-
-.. code-block:: bash
-
-  ceph orch daemon add <daemon-type>  --placement=<placement spec>
-
-For example 
-
-.. code-block:: bash
-
-  ceph orch daemon add mgr --placement=my_host
-
-To manually remove a daemon, please run:
-
-.. code-block:: bash
-
-  ceph orch daemon rm <daemon name>... [--force]
-
-For example 
-
-.. code-block:: bash
-
-  ceph orch daemon rm mgr.my_host.xyzxyz
-
-.. note:: 
-
-  For managed services (``unmanaged=False``), cephadm will automatically
-  deploy a new daemon a few seconds later.
-    
-* See :ref:`orchestrator-cli-create-osds` for special handling of unmanaged OSDs. 
-* See also :ref:`cephadm-pause`
diff --git a/doc/cephadm/service-management.rst b/doc/cephadm/service-management.rst
index dbf11bf76cf32..ecedb7fcec140 100644
--- a/doc/cephadm/service-management.rst
+++ b/doc/cephadm/service-management.rst
@@ -279,3 +279,65 @@ specification.
 3. Apply the new ``ServiceSpec``::
 
     ceph orch apply -i myservice.yaml [--dry-run]
+
+
+.. _cephadm-spec-unmanaged:
+
+Disable automatic deployment of daemons
+=======================================
+
+Cephadm supports disabling the automated deployment and removal of daemons per service. In
+this case, the CLI supports two commands that are dedicated to this mode. 
+
+To disable the automatic management of dameons, apply
+the :ref:`orchestrator-cli-service-spec` with ``unmanaged=True``. 
+
+``mgr.yaml``:
+
+.. code-block:: yaml
+
+  service_type: mgr
+  unmanaged: true
+  placement:
+    label: mgr
+
+.. code-block:: bash
+
+  ceph orch apply -i mgr.yaml
+
+.. note::
+
+  cephadm will no longer deploy any new daemons, if the placement
+  specification matches additional hosts.
+
+To manually deploy a daemon on a host, please execute:
+
+.. code-block:: bash
+
+  ceph orch daemon add <daemon-type>  --placement=<placement spec>
+
+For example 
+
+.. code-block:: bash
+
+  ceph orch daemon add mgr --placement=my_host
+
+To manually remove a daemon, please run:
+
+.. code-block:: bash
+
+  ceph orch daemon rm <daemon name>... [--force]
+
+For example 
+
+.. code-block:: bash
+
+  ceph orch daemon rm mgr.my_host.xyzxyz
+
+.. note:: 
+
+  For managed services (``unmanaged=False``), cephadm will automatically
+  deploy a new daemon a few seconds later.
+    
+* See :ref:`cephadm-osd-declarative` for special handling of unmanaged OSDs. 
+* See also :ref:`cephadm-pause`
-- 
2.39.5