fix ceph osd create help

    [ The following text is in the "UTF-8" character set. ]
    [ Your display is set for the "ANSI_X3.4-1968" character set.  ]
    [ Some characters may be displayed incorrectly. ]

Change ceph osd create <osd-id> to ceph osd create <uuid>, since this
is what the command is really doing.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>

diff --git a/doc/control.rst b/doc/control.rst
index 677ab78b86e27fd677928dac0f0155faf0c8992c..19c976e995a6511607d6e945419ec6a0f28c7f26 100644 (file)
--- a/doc/control.rst
+++ b/doc/control.rst
@@ -142,9 +142,9 @@ Create a cluster snapshot. ::
 
 Mark an OSD as lost. This may result in permanent data loss. Use with caution. ::
 
-       $ ceph osd create [<id>]
+       $ ceph osd create [<uuid>]
 
-Create a new OSD. If no ID is given, a new ID is automatically selected
+Create a new OSD. If no UUID is given, a new UUID is automatically selected
 if possible. ::
 
        $ ceph osd rm [<id>...]

diff --git a/src/test/cli/ceph/help.t b/src/test/cli/ceph/help.t
index 16667a5ad91f0776c923e3cc41733a5f416df406..47e5b3850089b5a94c70bdb9a26fc4f32ef886d0 100644 (file)
--- a/src/test/cli/ceph/help.t
+++ b/src/test/cli/ceph/help.t
@@ -43,7 +43,7 @@
     ceph osd crush set <osd-id> <name> <weight> [<loc1> [<loc2> ...]]
     ceph osd crush move <bucketname> <loc1> [<loc2> ...]
     ceph osd crush reweight <name> <weight>
-    ceph osd create [<osd-id>]
+    ceph osd create [<uuid>]
     ceph osd rm <osd-id> [<osd-id>...]
     ceph osd lost [--yes-i-really-mean-it]
     ceph osd reweight <osd-id> <weight>

diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index caa338cf69cad3fce141097f4d2c953b9cee462b..b82be10b9bf78d5c2fbe5ba233733fb9f7790019 100644 (file)
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -86,7 +86,7 @@ static void usage()
   cout << "  ceph osd crush set <osd-id> <name> <weight> [<loc1> [<loc2> ...]]\n";
   cout << "  ceph osd crush move <bucketname> <loc1> [<loc2> ...]\n";
   cout << "  ceph osd crush reweight <name> <weight>\n";
-  cout << "  ceph osd create [<osd-id>]\n";
+  cout << "  ceph osd create [<uuid>]\n";
   cout << "  ceph osd rm <osd-id> [<osd-id>...]\n";
   cout << "  ceph osd lost [--yes-i-really-mean-it]\n";
   cout << "  ceph osd reweight <osd-id> <weight>\n";