diff options
author | John Wilkins <john.wilkins@inktank.com> | 2013-01-02 11:15:16 -0800 |
---|---|---|
committer | John Wilkins <john.wilkins@inktank.com> | 2013-01-02 11:15:16 -0800 |
commit | d3b9803eabdebd0c0c592a00631f0af37fdda9af (patch) | |
tree | 57112c518e233f89d579c2064f3f4ac105cf0162 | |
parent | eb02eaede53c03579d015ca00a888a48dbab739a (diff) | |
download | ceph-d3b9803eabdebd0c0c592a00631f0af37fdda9af.tar.gz |
doc: Fixed typo, clarified usage.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r-- | doc/rados/deployment/mkcephfs.rst | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/doc/rados/deployment/mkcephfs.rst b/doc/rados/deployment/mkcephfs.rst index eb5dbfb22d8..88b1ed14925 100644 --- a/doc/rados/deployment/mkcephfs.rst +++ b/doc/rados/deployment/mkcephfs.rst @@ -90,10 +90,12 @@ Mount Disks to the Data Directories If you are running multiple OSDs per host and one hard disk per OSD, you should mount the disk under the OSD data directory (if you haven't done so already). +When mounting disks in this manner, there is no need for an entry in +``/etc/fstab``. .. versionadded:: 0.56 -For Botail (v 0.56) and beyond, you may specify the file system type, filesystem +For Bobtail (v 0.56) and beyond, you may specify the file system type, filesystem options, and mount options. Add the following to the ``[global]`` section of your Ceph configuration file, and replace the values in braces with appropriate values:: @@ -126,17 +128,13 @@ and created the default directories, you may deploy Ceph with the .. note:: ``mkcephfs`` is a quick bootstrapping tool. It does not handle more complex operations, such as upgrades. -To run ``mkcephfs`` for versions prior to Bobtail (v 0.55 and prior), execute -the following:: +To run ``mkcephfs``, execute the following:: cd /etc/ceph sudo mkcephfs -a -c /etc/ceph/ceph.conf -k ceph.keyring -To run ``mkcephfs`` for Bobtail (v 0.56) and beyond, execute -the following:: - - cd /etc/ceph - sudo mkcephfs -a -c /etc/ceph/ceph.conf -k ceph.keyring --mkfs +.. note:: For ``mkcephfs`` to use the ``mkfs`` configuration options, you MUST + specify a ``devs`` entry for each OSD. The script adds an admin key to the ``ceph.keyring``, which is analogous to a root password. See `Authentication`_ when running with ``cephx`` enabled. To |