From: John Wilkins <john.wilkins@inktank.com>
Date: Fri, 26 Apr 2013 21:07:03 +0000 (-0700)
Subject: doc: Modified Ceph deployment landing page.
X-Git-Tag: v0.61~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e775f15d73fa8f9c8fe5ca02a9fff041a84ac1a;p=ceph.git

doc: Modified Ceph deployment landing page.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
---

diff --git a/doc/rados/deployment/index.rst b/doc/rados/deployment/index.rst
index a53e3e3950e6..449b3ee99bd1 100644
--- a/doc/rados/deployment/index.rst
+++ b/doc/rados/deployment/index.rst
@@ -2,34 +2,53 @@
  Ceph Deployment
 =================
 
-You can deploy Ceph using many different deployment systems including Chef, Juju, 
-Puppet, and Crowbar. If you are just experimenting, Ceph provides some minimal 
-deployment tools that rely only on SSH and DNS to deploy Ceph. You need to set
-up the SSH and DNS settings manually.
+The ``ceph-deploy`` tool is a way to deploy Ceph relying only upon SSH access to
+the servers, ``sudo``, and some Python. It runs on your workstation, and does
+not require servers, databases, or anything any other tools. If you set up and
+tear down Ceph clusters a lot, and want minimal extra bureaucracy,
+``ceph-deploy`` is an ideal tool. The ``ceph-deploy`` tool is not a generic
+deployment system. It was designed exclusivly for Ceph users who want to get
+Ceph up and running quickly with sensible initial configuration settings without
+the overhead of installing Chef, Puppet or Juju. Users who want fine-control
+over security settings, partitions or directory  locations should use a tool
+such as Juju, Puppet, `Chef`_ or Crowbar. 
 
 
 .. raw:: html
 
-	<table cellpadding="10"><colgroup><col width="33%"><col width="33%"><col width="33%"></colgroup><tbody valign="top"><tr><td><h3>Ceph Deployment Scripts</h3>
+	<table cellpadding="10"><colgroup><col width="33%"><col width="33%"><col width="33%"></colgroup><tbody valign="top"><tr><td><h3>Ceph Deploy</h3>
+
+With ``ceph-deploy``, you can install Ceph packages on remote hosts,  create a
+cluster, add monitors, gather (or forget) keys, add metadata servers and OSDs,
+configure admin hosts, and tear down the clusters. With a single tool, you can
+develop scripts to  create, deploy and tear down clusters quickly and easily.
 
-We provide light-weight deployment scripts to help you evaluate Ceph. For
-professional deployment, you should consider professional deployment systems
-such as Juju, Puppet, Chef or Crowbar. 
 
 .. toctree:: 
 
-	Ceph Deploy <ceph-deploy>
-	mkcephfs (deprecated) <mkcephfs>
+   Preflight Checklist <preflight-checklist>	
+	Install Ceph <ceph-deploy-install>
+	Create a Cluster <ceph-deploy-new>
+	Add/Remove Monitor(s) <ceph-deploy-mon>
+	Key Management <ceph-deploy-keys>
+	
 
 .. raw:: html 
 
-	</td><td><h3>OpsCode Chef</h3>
+	</td><td><h3>mkcephfs (deprecated)</h3>
+	
+The ``mkcephfs`` utility generates an ``fsid`` and keys for your cluster, as
+defined by the Ceph configuration file. It does not create directories for you
+and relies on use of the ``root`` password. As of Ceph v0.60, it is deprecated
+in favor of ``ceph-deploy``.
 
 .. toctree:: 
 
-	Installing Chef <install-chef>
-	Deploying with Chef <chef>
+	mkcephfs (deprecated) <mkcephfs>
 	
 .. raw:: html
 
 	</td></tr></tbody></table>
+
+
+.. _Chef: http://wiki.ceph.com/02Guides/Deploying_Ceph_with_Chef
\ No newline at end of file