summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-04-16 13:22:13 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2013-04-16 13:22:13 -0700
commit3afe84b2007721ab5d968ca3b7f4cc8bc30f52fc (patch)
treee4686a3ca6354a8a0bd4025348b8296aa2539bc3
parent4a84ddbd30ef3cc105053f272819c2f1ea2be0d2 (diff)
downloadceph-3afe84b2007721ab5d968ca3b7f4cc8bc30f52fc.tar.gz
doc: Cherry picked from master to next. Adds comments on naming OSDs.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/rados/configuration/osd-config-ref.rst25
1 files changed, 24 insertions, 1 deletions
diff --git a/doc/rados/configuration/osd-config-ref.rst b/doc/rados/configuration/osd-config-ref.rst
index 8d1ab4ac1a2..9486b55912f 100644
--- a/doc/rados/configuration/osd-config-ref.rst
+++ b/doc/rados/configuration/osd-config-ref.rst
@@ -5,7 +5,30 @@
You can configure OSDs in the Ceph configuration file, but OSDs can use the
default values and a very minimal configuration. A minimal OSD configuration
sets ``osd journal size`` and ``osd host``, and uses default values for
-nearly everything else.
+nearly everything else.
+
+OSDs are numerically identified in incremental fashion, beginning with ``0``
+using the following convention. ::
+
+ osd.0
+ osd.1
+ osd.2
+
+In a configuration file, you may specify settings for all OSDs in the cluster
+by adding configuration settings to the ``[osd]`` section of your configuration
+file. To add settings directly to a specific OSD (e.g., ``osd host``), enter
+it in an OSD-specific section of your configuration file. For example:
+
+.. code-block:: ini
+
+ [osd]
+ osd journal size = 1024
+
+ [osd.0]
+ osd host = osd-host-a
+
+ [osd.1]
+ osd host = osd-host-b
General Settings