doc: fix crush set syntax

No commas between parameters, pool is required.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/doc/rados/operations/add-or-rm-osds.rst b/doc/rados/operations/add-or-rm-osds.rst
index ea891472f1c6f5282ce07e7891a24781d173986e..3c712b46b91199596889bfbbec5f9438683e288e 100644 (file)
--- a/doc/rados/operations/add-or-rm-osds.rst
+++ b/doc/rados/operations/add-or-rm-osds.rst
@@ -131,7 +131,7 @@ hard disks than older hosts in the cluster (i.e., they may have greater weight).
    host, assign it a weight, recompile it and set it. See      `Add/Move an OSD`_ for
    details. :: 
 
-       ceph osd crush set {id} {name} {weight}  [{bucket-type}={bucket-name}, ...]
+       ceph osd crush set {id} {name} {weight} pool={pool-name}  [{bucket-type}={bucket-name} ...]
 
 
 .. topic:: Argonaut (v0.48) Best Practices
@@ -190,7 +190,7 @@ hard disks than older hosts in the cluster.
    also decompile the CRUSH map edit the file, recompile it and set it. See
    `Add/Move an OSD`_ for details. :: 
 
-       ceph osd crush set {id} {name} {weight} pool={pool-name}  [{bucket-type}={bucket-name}, ...]
+       ceph osd crush set {id} {name} {weight} pool={pool-name}  [{bucket-type}={bucket-name} ...]
 
 
 Starting the OSD

diff --git a/doc/rados/operations/crush-map.rst b/doc/rados/operations/crush-map.rst
index 682e967767e769e94b08e4f8d59bdd9bdd2b7191..4f6783b5b4aa0898409164d05f1017b13a41a508 100644 (file)
--- a/doc/rados/operations/crush-map.rst
+++ b/doc/rados/operations/crush-map.rst
@@ -403,7 +403,7 @@ Add/Move an OSD
 To add or move an OSD in the CRUSH map of a running cluster, execute the
 following::
 
-       ceph osd crush set {id} {name} {weight} pool={pool-name}  [{bucket-type}={bucket-name}, ...] 
+       ceph osd crush set {id} {name} {weight} pool={pool-name}  [{bucket-type}={bucket-name} ...]
 
 Where:
 
@@ -444,13 +444,13 @@ Where:
 :Description: You may specify the OSD's location in the CRUSH hierarchy. 
 :Type: Key/value pairs.
 :Required: No
-:Example: ``datacenter=dc1, room=room1, row=foo, rack=bar, host=foo-bar-1``
+:Example: ``datacenter=dc1 room=room1 row=foo rack=bar host=foo-bar-1``
 
 
 The following example adds ``osd.0`` to the hierarchy, or moves the OSD from a
 previous location. :: 
 
-       ceph osd crush set 0 osd.0 1.0 pool=data datacenter=dc1, room=room1, row=foo, rack=bar, host=foo-bar-1
+       ceph osd crush set 0 osd.0 1.0 pool=data datacenter=dc1 room=room1 row=foo rack=bar host=foo-bar-1
 
 
 Adjust an OSD's CRUSH Weight
@@ -520,7 +520,7 @@ Where:
 :Description: You may specify the bucket's location in the CRUSH hierarchy. 
 :Type: Key/value pairs.
 :Required: No
-:Example: ``datacenter=dc1, room=room1, row=foo, rack=bar, host=foo-bar-1``
+:Example: ``datacenter=dc1 room=room1 row=foo rack=bar host=foo-bar-1``
 
 
 Tunables