From: Joao Eduardo Luis <joao@suse.de>
Date: Thu, 4 May 2017 15:12:33 +0000 (+0100)
Subject: doc/man: document new mon commands
X-Git-Tag: v12.1.0~266^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e80faf198bebf3e14cc8839d88a1dd404a2b33c2;p=ceph.git

doc/man: document new mon commands

Includes brief description for `ceph osd new`, `ceph osd destroy` and
`ceph osd purge`.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index 805e4ad81faa0..bbadf7cb53cef 100644
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -39,7 +39,7 @@ Synopsis
 
 | **ceph** **mon_status**
 
-| **ceph** **osd** [ *blacklist* \| *blocked-by* \| *create* \| *deep-scrub* \| *df* \| *down* \| *dump* \| *erasure-code-profile* \| *find* \| *getcrushmap* \| *getmap* \| *getmaxosd* \| *in* \| *lspools* \| *map* \| *metadata* \| *out* \| *pause* \| *perf* \| *pg-temp* \| *primary-affinity* \| *primary-temp* \| *repair* \| *reweight* \| *reweight-by-pg* \| *rm* \| *scrub* \| *set* \| *setcrushmap* \| *setmaxosd*  \| *stat* \| *tree* \| *unpause* \| *unset* ] ...
+| **ceph** **osd** [ *blacklist* \| *blocked-by* \| *create* \| *new* \| *deep-scrub* \| *df* \| *down* \| *dump* \| *erasure-code-profile* \| *find* \| *getcrushmap* \| *getmap* \| *getmaxosd* \| *in* \| *lspools* \| *map* \| *metadata* \| *out* \| *pause* \| *perf* \| *pg-temp* \| *primary-affinity* \| *primary-temp* \| *repair* \| *reweight* \| *reweight-by-pg* \| *rm* \| *destroy* \| *purge* \| *scrub* \| *set* \| *setcrushmap* \| *setmaxosd*  \| *stat* \| *tree* \| *unpause* \| *unset* ] ...
 
 | **ceph** **osd** **crush** [ *add* \| *add-bucket* \| *create-or-move* \| *dump* \| *get-tunable* \| *link* \| *move* \| *remove* \| *rename-bucket* \| *reweight* \| *reweight-all* \| *reweight-subtree* \| *rm* \| *rule* \| *set* \| *set-tunable* \| *show-tunables* \| *tunables* \| *unlink* ] ...
 
@@ -482,6 +482,31 @@ Usage::
 
 	ceph osd create {<uuid>} {<id>}
 
+Subcommand ``new`` reuses a previously destroyed OSD *id*. The new OSD will
+have the specified *uuid*, and the command expects a JSON file containing
+the base64 cephx key for auth entity *client.osd.<id>*, as well as optional
+base64 cepx key for dm-crypt lockbox access and a dm-crypt key. Specifying
+a dm-crypt requires specifying the accompanying lockbox cephx key.
+
+Usage::
+
+    ceph osd new {<id>} {<uuid>} -i {<secrets.json>}
+
+The secrets JSON file is expected to maintain a form of the following format::
+
+    {
+        "cephx_secret": "AQBWtwhZdBO5ExAAIDyjK2Bh16ZXylmzgYYEjg=="
+    }
+
+Or::
+
+    {
+        "cephx_secret": "AQBWtwhZdBO5ExAAIDyjK2Bh16ZXylmzgYYEjg==",
+        "cephx_lockbox_secret": "AQDNCglZuaeVCRAAYr76PzR1Anh7A0jswkODIQ==",
+        "dmcrypt_key": "<dm-crypt key>"
+    }
+        
+
 Subcommand ``crush`` is used for CRUSH management. It uses some additional
 subcommands.
 
@@ -938,6 +963,29 @@ Usage::
 
 	ceph osd rm <ids> [<ids>...]
 
+Subcommand ``destroy`` marks OSD *id* as *destroyed*, removing its cephx
+entity's keys and all of its dm-crypt and daemon-private config key
+entries.
+
+This command will not remove the OSD from crush, nor will it remove the
+OSD from the OSD map. Instead, once the command successfully completes,
+the OSD will show marked as *destroyed*.
+
+In order to mark an OSD as destroyed, the OSD must first be marked as
+**lost**.
+
+Usage::
+
+    ceph osd destroy <id> {--yes-i-really-mean-it}
+
+
+Subcommand ``purge`` performs a combination of ``osd destroy``,
+``osd rm`` and ``osd crush remove``.
+
+Usage::
+
+    ceph osd purge <id> {--yes-i-really-mean-it}
+
 Subcommand ``scrub`` initiates scrub on specified osd.
 
 Usage::