Merge PR ceph#38849 into master

* refs/pull/38849/head: doc: document ms_mode option in the mount.ceph manpage Reviewed-by: Ilya Dryomov <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Rishabh Dave <[email protected]>
joskid · Jan 12, 2021 · 1ffbf61 · 1ffbf61
2 parents 1e9622c + dac04fc
commit 1ffbf61
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/doc/man/8/mount.ceph.rst b/doc/man/8/mount.ceph.rst
@@ -71,6 +71,20 @@ Basic
 :command:`mount_timeout`
     int (seconds), Default: 60
 
+:command:`ms_mode=<legacy|crc|secure|prefer-crc|prefer-secure>`
+    Set the connection mode that the client uses for transport. The available
+    modes are:
+
+    - ``legacy``: use messenger v1 protocol to talk to the cluster
+
+    - ``crc``: use messenger v2, without on-the-wire encryption
+
+    - ``secure``: use messenger v2, with on-the-wire encryption
+
+    - ``prefer-crc``: crc mode, if denied agree to secure mode
+
+    - ``prefer-secure``: secure mode, if denied agree to crc mode
+
 :command:`name`
     RADOS user to authenticate as when using CephX. Default: guest