From 937f28e6a6e7b373e2fc5ea7a05a72ab4f82ee78 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 11 Mar 2019 08:52:28 -0500 Subject: [PATCH] doc/releases/nautilus: add msgr2 refs Signed-off-by: Sage Weil --- doc/dev/cephx.rst | 2 +- doc/dev/msgr2.rst | 2 +- doc/rados/configuration/msgr2.rst | 5 +++++ doc/releases/nautilus.rst | 5 +++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/dev/cephx.rst b/doc/dev/cephx.rst index 1703e3eb4cf..27e501f9929 100644 --- a/doc/dev/cephx.rst +++ b/doc/dev/cephx.rst @@ -60,7 +60,7 @@ Context The authentication messages described here are specific to the cephx auth implementation. The messages are transferred by the Messenger protocol or by MAuth messages, depending on the version of the -messenger protocol. See also :ref:`msgr2`. +messenger protocol. See also :ref:`msgr2-protocol`. An initial (messenger) handshake negotiates an authentication method to be used (cephx vs none or krb or whatever) and an assertion of what diff --git a/doc/dev/msgr2.rst b/doc/dev/msgr2.rst index 6b4cc5f1283..7257a7c7fc3 100644 --- a/doc/dev/msgr2.rst +++ b/doc/dev/msgr2.rst @@ -1,4 +1,4 @@ -.. _msgr2: +.. _msgr2-protocol: msgr2 protocol ============== diff --git a/doc/rados/configuration/msgr2.rst b/doc/rados/configuration/msgr2.rst index 21ef5889241..cea412e73c6 100644 --- a/doc/rados/configuration/msgr2.rst +++ b/doc/rados/configuration/msgr2.rst @@ -1,3 +1,5 @@ +.. _msgr2: + Messenger v2 ============ @@ -216,4 +218,7 @@ the monitors' configuration database) may be helpful. For example,:: mon_host = [v2:10.0.0.1:3300/0,v1:10.0.0.1:6789/0] # mv /etc/ceph/ceph.conf.new /etc/ceph/ceph.conf +Protocol +-------- +For a detailed description of the v2 wire protocol, see :ref:`msgr2-protocol`. diff --git a/doc/releases/nautilus.rst b/doc/releases/nautilus.rst index 83c7a4b60a0..319a929bf4a 100644 --- a/doc/releases/nautilus.rst +++ b/doc/releases/nautilus.rst @@ -47,7 +47,7 @@ Major Changes from Mimic * The number of placement groups (PGs) per pool can now be decreased at any time, and the cluster can automatically tune the PG count based on cluster utilization or administrator hints. - * The new *v2* wire protocol brings support for encryption on the wire. + * The new :ref:`v2 wire protocol ` brings support for encryption on the wire. * Physical storage devices consumed by OSD and Monitor daemons are now tracked by the cluster along with health metrics (i.e., SMART), and the cluster can apply a pre-trained prediction model @@ -266,7 +266,8 @@ Instructions #. Verify the cluster is healthy with ``ceph health``. -#. To enable the new v2 network protocol, issue the following command:: +#. To enable the new :ref:`v2 network protocol `, issue the + following command:: ceph mon enable-msgr2