update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / doc / dev / freebsd.rst

diff --git a/ceph/doc/dev/freebsd.rst b/ceph/doc/dev/freebsd.rst
index 5a401ee2a2394d87ab3a9f75269b4d42a4aa27f7..b1645b873b360c77fc3427609c432dca5fd2f619 100644 (file)
--- a/ceph/doc/dev/freebsd.rst
+++ b/ceph/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``
 
 
@@ -44,15 +44,10 @@ MON creation
 
 Monitors are created by following the manual creation steps on::
 
-  http://docs.ceph.com/docs/master/install/manual-deployment/
+  https://docs.ceph.com/en/latest/install/manual-freebsd-deployment/
 
 
 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`