From 8e2fcae16eaac2fff6c748780ff6fc4f243369ba Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 21 Dec 2018 18:25:55 -0600 Subject: [PATCH] doc: fix some 'mon addr' references Signed-off-by: Sage Weil --- doc/dev/mon-bootstrap.rst | 2 +- doc/man/8/ceph-deploy.rst | 2 +- doc/man/8/ceph-mon.rst | 2 +- doc/man/8/monmaptool.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/dev/mon-bootstrap.rst b/doc/dev/mon-bootstrap.rst index 66b52d8d452a9..eb99a477d8670 100644 --- a/doc/dev/mon-bootstrap.rst +++ b/doc/dev/mon-bootstrap.rst @@ -72,7 +72,7 @@ The monitor peers are provided in several ways: #. via the initial monmap, provided via ``--monmap `` #. via the bootstrap monmap generated from ``--mon-host `` -#. via the bootstrap monmap generated from ``[mon.*]`` sections with ``mon addr`` in the config file +#. via the bootstrap monmap generated from ``[mon.*]`` sections with the deprecated ``mon addr`` options in the config file (note that this method is *not* recommended and does not support binding to both v1 and v2 protocol addresses) #. dynamically via the admin socket However, these methods are not completely interchangeable because of diff --git a/doc/man/8/ceph-deploy.rst b/doc/man/8/ceph-deploy.rst index e3778b8e5f430..555626d7e0c32 100644 --- a/doc/man/8/ceph-deploy.rst +++ b/doc/man/8/ceph-deploy.rst @@ -186,7 +186,7 @@ Subcommand ``add`` is used to add a monitor to an existing cluster. It first detects platform and distro for desired host and checks if hostname is compatible for deployment. It then uses the monitor keyring, ensures configuration for new monitor host and adds the monitor to the cluster. If the section for the monitor -exists and defines a mon addr that will be used, otherwise it will fallback by +exists and defines a monitor address that will be used, otherwise it will fallback by resolving the hostname to an IP. If :option:`--address` is used it will override all other options. After adding the monitor to the cluster, it gives it some time to start. It then looks for any monitor errors and checks monitor status. Monitor diff --git a/doc/man/8/ceph-mon.rst b/doc/man/8/ceph-mon.rst index 7a2cd032c4814..0c2c57925e55a 100644 --- a/doc/man/8/ceph-mon.rst +++ b/doc/man/8/ceph-mon.rst @@ -64,7 +64,7 @@ Options - A list of monitors and their addresses. This list of monitors can come from a monmap (``--monmap ``), the ``mon host`` configuration value (in *ceph.conf* or via ``-m - host1,host2,...``), or ``mon addr`` lines in *ceph.conf*. If this + host1,host2,...``), or (for backward compatibility) the deprecated ``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. diff --git a/doc/man/8/monmaptool.rst b/doc/man/8/monmaptool.rst index bed0c944d8db0..9971b558fa0c1 100644 --- a/doc/man/8/monmaptool.rst +++ b/doc/man/8/monmaptool.rst @@ -53,7 +53,7 @@ Options #. ``--monmap filename`` to specify a monmap to load #. ``--mon-host 'host1,ip2'`` to specify a list of hosts or ip addresses - #. ``[mon.foo]`` sections containing ``mon addr`` settings in the config + #. ``[mon.foo]`` sections containing ``mon addr`` settings in the config. Note that this method is not recommended and support will be removed in a future release. .. option:: --filter-initial-members -- 2.39.5