summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2012-07-12 08:55:15 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2012-07-12 08:55:15 -0700
commitad8beeb407cc0837646c4dacc8598db29efe05fe (patch)
treec04c305c75bdf1199ccc29d102eda17064104052
parent63a1799853abcb8f0bc09b5f5ae13e997c6e4496 (diff)
downloadceph-ad8beeb407cc0837646c4dacc8598db29efe05fe.tar.gz
doc: minor edits.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/config-cluster/chef.rst11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/config-cluster/chef.rst b/doc/config-cluster/chef.rst
index bf2bea8773c..588ebcad41e 100644
--- a/doc/config-cluster/chef.rst
+++ b/doc/config-cluster/chef.rst
@@ -98,10 +98,10 @@ For example::
"default_attributes" : {
"ceph": {
- "monitor-secret": "AQBAMuJPINJgFhAAziXIrLvTvAz4PRo5IK/Log==",
+ "monitor-secret": "{replace-with-generated-secret}",
"config": {
- "fsid": "ddca2b02-3ddf-42fb-ba52-0ee1982c6da0",
- "mon_initial_members": "mon-host"
+ "fsid": "{replace-with-generated-uuid}",
+ "mon_initial_members": "{replace-with-monitor-hostname(s)}"
}
}
}
@@ -155,9 +155,8 @@ Then, add at least one of::
"role[ceph-cookbooks-mds]"
"role[ceph-cookbooks-radosgw]"
-If you add more than one role, separate them with a comma. The following
-example adds a node named `mon-host` to the `Ceph` environment and
-runs the ``apt`` recipe followed by the roles ``ceph-mon`` and ``ceph-osd``::
+If you add more than one role, separate them with a comma. Replace the
+``{hostname}`` setting of the ``name`` key to the host name for the node.
{
"chef_environment": "Ceph",