summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2012-11-16 08:04:55 +0100
committerJosh Durgin <josh.durgin@inktank.com>2012-11-16 08:07:51 +0100
commitc707568a1b86cab68d2cebb82b0c701dc058282e (patch)
tree9749d078b9f81a1fe4d5bf69316dc0d60b653fca /doc
parentdoc: add Hadoop configuration parameters (diff)
downloadceph-c707568a1b86cab68d2cebb82b0c701dc058282e.tar.xz
ceph-c707568a1b86cab68d2cebb82b0c701dc058282e.zip
doc: fix crush set syntax
No commas between parameters, pool is required. Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/rados/operations/add-or-rm-osds.rst4
-rw-r--r--doc/rados/operations/crush-map.rst8
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/rados/operations/add-or-rm-osds.rst b/doc/rados/operations/add-or-rm-osds.rst
index ea891472f1c..3c712b46b91 100644
--- 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 682e967767e..4f6783b5b4a 100644
--- 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