From cd909acaa48fce50d592953e20f74aab4d71d490 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 19 Dec 2011 08:04:53 -0800
Subject: [PATCH] doc: fix mon cluster expansion docs

Signed-off-by: Sage Weil <sage@newdream.net>
---
 doc/ops/manage/grow/mon.rst | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/doc/ops/manage/grow/mon.rst b/doc/ops/manage/grow/mon.rst
index 0ae9adbe90b84..416668d91123f 100644
--- a/doc/ops/manage/grow/mon.rst
+++ b/doc/ops/manage/grow/mon.rst
@@ -6,22 +6,31 @@ Adding a monitor
 ----------------
 
 #. Initialize the new monitor's data directory with the ``ceph-mon
-   --mkfs`` command.  You need to provide the new monitor with three
+   --mkfs`` command.  You need to provide the new monitor with four
    pieces of information:
 
-   - the cluster fsid
-   - one or more existing monitors to join
-   - the monitor authentication key ``mon.``
+   - the cluster fsid.  This can come from a monmap (``--monmap
+     </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``.
+   - the monitor authentication key ``mon.``.  This should be passed
+     in explicitly via a keyring (``--keyring </some/path>``).
 
-   The simplest way to do this is probably::
+   Any combination of the above arguments that provide the four needed
+   pieces of information will work.  The simplest way to do this is
+   usually::
 
      $ ceph mon getmap -o /tmp/monmap           # provides fsid and existing monitor addrs
      $ ceph auth export mon. -o /tmp/monkey     # mon. auth key
      $ ceph-mon -i newname --mkfs --monmap /tmp/monmap --keyring /tmp/monkey
 
-#. Start the new monitor and it will automatically join the cluster::
+#. 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::
 
-    $ ceph-mon -i newname
+    $ 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
-- 
2.39.5