fix ceph osd create help

Commit Message

Danny Kukawka Aug. 16, 2012, 10:56 a.m. UTC

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 <[e-mail]>
---
 doc/control.rst          |    4 ++--
 src/test/cli/ceph/help.t |    2 +-
 src/tools/ceph.cc        |    2 +-
 3 Dateien geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)

Patch

diff --git a/doc/control.rst b/doc/control.rst
index 677ab78..19c976e 100644
--- 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 16667a5..47e5b38 100644
--- 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 caa338c..b82be10 100644
--- 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";