summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-01-02 11:24:39 -0800
committerJohn Wilkins <john.wilkins@inktank.com>2013-01-02 11:24:39 -0800
commit82297706da549e2e7451eed45b7f449958b6a10b (patch)
tree1c2ec204d59405bc8377dded82267204fce7e838
parentd3b9803eabdebd0c0c592a00631f0af37fdda9af (diff)
downloadceph-82297706da549e2e7451eed45b7f449958b6a10b.tar.gz
doc: Minor edits.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/start/quick-start.rst13
1 files changed, 4 insertions, 9 deletions
diff --git a/doc/start/quick-start.rst b/doc/start/quick-start.rst
index a68875577e6..7fcc0b6369b 100644
--- a/doc/start/quick-start.rst
+++ b/doc/start/quick-start.rst
@@ -115,22 +115,17 @@ You must perform the following steps to deploy the configuration.
sudo mkdir -p /var/lib/ceph/mds/ceph-a
-#. For versions prior to Bobtail (v 0.55 and before), execute the following
- on the Ceph server host::
+#. Execute the following on the Ceph server host::
cd /etc/ceph
sudo mkcephfs -a -c /etc/ceph/ceph.conf -k ceph.keyring
-#. For Bobtail and subsequent versions (v 0.56 and after), execute the
- following on the Ceph server host::
-
- cd /etc/ceph
- sudo mkcephfs -a -c /etc/ceph/ceph.conf -k ceph.keyring --mkfs
Among other things, ``mkcephfs`` will deploy Ceph and generate a
``client.admin`` user and key. For Bobtail and subsequent versions (v 0.56 and
-after), if you specify ``--mkfs``, the ``mkcephfs`` script will create and mount
-the file system for you.
+after), the ``mkcephfs`` script will create and mount the filesystem for you
+provided you specify ``osd mkfs`` ``osd mount`` and ``devs`` settings in your
+Ceph configuration file.
Start Ceph