mon: update man page to document --mkfs stuff

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/doc/man/8/ceph-mon.rst b/doc/man/8/ceph-mon.rst
index 85970b3a530f42edbcc7761153018c8112011dc4..639c1b076251557510de9e7fd6a0390a7206ac96 100644 (file)
--- a/doc/man/8/ceph-mon.rst
+++ b/doc/man/8/ceph-mon.rst
@@ -40,6 +40,30 @@ Options
    ``/etc/ceph/ceph.conf`` to determine monitor addresses during
    startup.
 
+.. option:: --mkfs
+
+   Initialize the ``mon data`` directory with seed information to form
+   and initial ceph file system or to join an existing monitor
+   cluster.  Three pieces of information must be provided:
+
+   - The cluster fsid.  This can come from a monmap (``--monmap <path>``) or
+     explicitly via ``--fsid <uuid>``.
+   - A list of monitors and their addresses.  This list of monitors
+     can come from a monmap (``--monmap <path>``), the ``mon host``
+     configuration value (in *ceph.conf* or via ``-m
+     host1,host2,...`), or ``mon addr`` lines in *ceph.conf*.  If this
+     monitor is to be part of the initial monitor quorum for a new
+     Ceph cluster, then it must be included in the initial list,
+     matching either the name or address of a monitor in the list.
+     When matching by address, either the ``public addr`` or ``public
+     subnet`` options may be used.
+   - The monitor secret key ``mon.``.  This must be included in the
+     keyring provided via ``--keyring <path>``.
+
+.. option:: --keyring
+
+   Specify a keyring for use with ``--mkfs``.
+
 
 Availability
 ============

diff --git a/doc/ops/manage/grow/mon.rst b/doc/ops/manage/grow/mon.rst
index 8d9e794d84b17371c4cd5bca776f40acd48ae137..1acc204fa0ad116e61184e9f4866621b6ecfc648 100644 (file)
--- a/doc/ops/manage/grow/mon.rst
+++ b/doc/ops/manage/grow/mon.rst
@@ -13,7 +13,7 @@ Adding a monitor
      </path/to/monmap>``) for explicitly via ``--fsid <fsid>``.
    - one or more existing monitors to join.  This can come via ``-m
      <host1,host2,...>``, a monmap (``--monmap </some/path>``), or
-     ``[mon.foo]`` sections with ``mon addr`` fields in ``ceph.conf``.
+     ``[mon.foo]`` sections with ``mon addr`` fields in *ceph.conf*.
    - the monitor authentication key ``mon.``.  This should be passed
      in explicitly via a keyring (``--keyring </some/path>``).
 
@@ -28,12 +28,12 @@ Adding a monitor
 #. Start the new monitor and it will automatically join the cluster.
    The daemon needs to know which address to bind to, either via
    ``--public-addr <ip:port>`` or by setting ``mon addr`` in the
-   appropriate section of ``ceph.conf``.  For example::
+   appropriate section of *ceph.conf*.  For example::
 
     $ ceph-mon -i newname --public-addr <ip:port>
 
 #. If you would like other nodes to be able to use this monitor during
-   their initial startup, you'll need to adjust ``ceph.conf`` to add a
+   their initial startup, you'll need to adjust *ceph.conf* to add a
    section and ``mon addr`` for the new monitor, or add it to the
    existing ``mon host`` list.
 
@@ -82,5 +82,5 @@ form a quorum.
 
      $ service ceph start mon           # on each node with a surviving monitor
 
-6) Remove the old monitors from ``ceph.conf`` so that nobody tries to
+6) Remove the old monitors from *ceph.conf* so that nobody tries to
    connect to the old instances.