summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2012-07-12 08:47:47 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2012-07-12 08:47:47 -0700
commit63a1799853abcb8f0bc09b5f5ae13e997c6e4496 (patch)
tree690f3a1bead04198a2ec3477e3c24b95795238ba
parentcc8df29e19a1fc441ad903aeeb59f7d3e15a5e7c (diff)
downloadceph-63a1799853abcb8f0bc09b5f5ae13e997c6e4496.tar.gz
doc: cookbook name change broke some things in doc. Fixed.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/config-cluster/chef.rst22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/config-cluster/chef.rst b/doc/config-cluster/chef.rst
index b6490df4d98..bf2bea8773c 100644
--- a/doc/config-cluster/chef.rst
+++ b/doc/config-cluster/chef.rst
@@ -146,14 +146,14 @@ The node configuration should appear in your text editor. Change the
``chef_environment`` value to ``Ceph`` (or whatever name you set for your
Ceph environment).
-In the ``run_list``, add ``"recipe[ceph::apt]",`` to all nodes as the first
-setting, so that Chef can install or update the necessary packages. Then,
-add at least one of::
+In the ``run_list``, add ``"recipe[ceph-cookbooks::apt]",`` to all nodes as
+the first setting, so that Chef can install or update the necessary packages.
+Then, add at least one of::
- "role[ceph-mon]"
- "role[ceph-osd]"
- "role[ceph-mds]"
- "role[ceph-radosgw]"
+ "role[ceph-cookbooks-mon]"
+ "role[ceph-cookbooks-osd]"
+ "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
@@ -161,16 +161,16 @@ runs the ``apt`` recipe followed by the roles ``ceph-mon`` and ``ceph-osd``::
{
"chef_environment": "Ceph",
- "name": "mon-host",
+ "name": "{hostname}",
"normal": {
"tags": [
]
},
"run_list": [
- "recipe[ceph::apt]",
- "role[ceph-mon]",
- "role[ceph-mds]"
+ "recipe[ceph-cookbooks::apt]",
+ "role[ceph-cookbooks-mon]",
+ "role[ceph-cookbooks-mds]"
]
}