From: Alfredo Deza Date: Wed, 30 May 2018 19:48:55 +0000 (-0400) Subject: doc/dev remove ceph-disk from freebsd guide, link to manual reference X-Git-Tag: v14.0.1~1088^2~16 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2231412e3583ee1865200970d6c67e30aed30759;p=ceph.git doc/dev remove ceph-disk from freebsd guide, link to manual reference Signed-off-by: Alfredo Deza --- diff --git a/doc/dev/freebsd.rst b/doc/dev/freebsd.rst index 5a401ee2a239..71568ef388dd 100644 --- a/doc/dev/freebsd.rst +++ b/doc/dev/freebsd.rst @@ -3,7 +3,7 @@ FreeBSD Implementation details ============================== -Disk layout +Disk layout ----------- Current implementation works on ZFS pools @@ -16,7 +16,7 @@ Current implementation works on ZFS pools zpool create -o mountpoint=/var/lib/ceph/osd/osd.1 osd * Maybe add some cache and log (ZIL)? Assuming that ada2 is an SSD:: - + gpart create -s GPT ada2 gpart add -t freebsd-zfs -l osd1-log -s 1G ada2 zpool add osd1 log gpt/osd1-log @@ -30,12 +30,12 @@ Configuration ------------- As per FreeBSD default parts of extra software go into ``/usr/local/``. Which -means that for ``/etc/ceph.conf`` the default location is +means that for ``/etc/ceph.conf`` the default location is ``/usr/local/etc/ceph/ceph.conf``. Smartest thing to do is to create a softlink from ``/etc/ceph`` to ``/usr/local/etc/ceph``:: ln -s /usr/local/etc/ceph /etc/ceph - + A sample file is provided in ``/usr/local/share/doc/ceph/sample.ceph.conf`` @@ -50,9 +50,4 @@ Monitors are created by following the manual creation steps on:: OSD creation ------------ -OSDs can be create with ``ceph-disk``:: - - ceph-disk prepare /var/lib/ceph/osd/osd1 - ceph-disk activate /var/lib/ceph/osd/osd1 - -And things should automagically work out. +OSDs can be manually created only, see :ref:`freebsd_adding_osds`