summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-12 09:57:31 -0700
committerSage Weil <sage@inktank.com>2012-07-12 10:00:41 -0700
commit5ceb7c734af5a05c2e6a60e1f33a8b491cf25cca (patch)
tree313ad4a85d67abfe52e4f91953db8c3bf26f88c5
parentd1054df6be205ba4df989ee15421e0249d5bc23f (diff)
downloadceph-5ceb7c734af5a05c2e6a60e1f33a8b491cf25cca.tar.gz
doc: fix config metavariables discussion
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--doc/dev/config.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/dev/config.rst b/doc/dev/config.rst
index a4fdb49b169..49eda359a4d 100644
--- a/doc/dev/config.rst
+++ b/doc/dev/config.rst
@@ -39,14 +39,14 @@ A sample configuration file can be found in src/sample.ceph.conf.
Metavariables
=============
-The configuration system supports certain "metavariables." If these occur
-inside a configuration value, they are expanded into something else-- similar to
-how bash shell expansion works.
+The configuration system allows any configuration value to be
+substituted into another value using the ``$varname`` syntax, similar
+to how bash shell expansion works.
-There are a few different metavariables:
+A few additional special metavariables are also defined:
- $host: expands to the current hostname
- - $type: expands to one of "mds", "osd", or "mon"
- - $id: expands to the daemon identifier. For osd.0, this would be "0"; for mds.a, it would be "a"
+ - $type: expands to one of "mds", "osd", "mon", or "client"
+ - $id: expands to the daemon identifier. For ``osd.0``, this would be ``0``; for ``mds.a``, it would be ``a``; for ``client.admin``, it would be ``admin``.
- $num: same as $id
- $name: expands to $type.$id