summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoss Turk <ross@inktank.com>2012-05-21 18:22:35 -0700
committerRoss Turk <ross@inktank.com>2012-05-21 18:22:35 -0700
commitcf5848676e7b48d252fae9ff525795d574bef188 (patch)
tree87081af2ea5d72b958d38a2297af8ec2a58a11e6 /doc
parent6149fb700fe88d303f4adcc88734b730ae5187f4 (diff)
downloadceph-cf5848676e7b48d252fae9ff525795d574bef188.tar.gz
doc: added links from the chef install doc to the chef config doc and back
Signed-off-by: Ross Turk <ross@inktank.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/config-cluster/chef.rst3
-rw-r--r--doc/install/chef.rst4
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/config-cluster/chef.rst b/doc/config-cluster/chef.rst
index cd78e15314d..b204af0a13f 100644
--- a/doc/config-cluster/chef.rst
+++ b/doc/config-cluster/chef.rst
@@ -3,7 +3,8 @@
=====================
We use Chef cookbooks to deploy Ceph. See `Managing Cookbooks with Knife`_ for details
-on using ``knife``.
+on using ``knife``. For Chef installation instructions, see
+`Installing Chef <../../install/chef>`_.
Add a Cookbook Path
-------------------
diff --git a/doc/install/chef.rst b/doc/install/chef.rst
index 583128eb851..0af291ebe6f 100644
--- a/doc/install/chef.rst
+++ b/doc/install/chef.rst
@@ -195,6 +195,10 @@ Chef nodes. ::
A list of the nodes you've boostrapped should appear.
+
+See the `Deploy With Chef <../../config-cluster/chef>`_ section for information
+on using Chef to deploy your Ceph cluster.
+
.. _Chef Architecture Introduction: http://wiki.opscode.com/display/chef/Architecture+Introduction
.. _Installing Chef Client on Ubuntu or Debian: http://wiki.opscode.com/display/chef/Installing+Chef+Client+on+Ubuntu+or+Debian
.. _Installing Chef Server on Debian or Ubuntu using Packages: http://wiki.opscode.com/display/chef/Installing+Chef+Server+on+Debian+or+Ubuntu+using+Packages