doc/cephadm: document new --no-ceph-conf flag for `orch client-keyring set`

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 2741d9471c959f07f9b55c52114ea9d71916345e)

diff --git a/doc/cephadm/operations.rst b/doc/cephadm/operations.rst
index 623cf1635a64e8220e06341068dc78ae9dea0ed4..865663190fa7d311856f46206b35e19d8f1320f1 100644 (file)
--- a/doc/cephadm/operations.rst
+++ b/doc/cephadm/operations.rst
@@ -532,6 +532,13 @@ The resulting keyring file is:
 
   -rw-r-----. 1 qemu qemu 156 Apr 21 08:47 /etc/ceph/client.client.rbd.keyring
 
+By default, cephadm will also manage ``/etc/ceph/ceph.conf`` on hosts where it writes the keyrings.
+This feature can be suppressed by passing ``--no-ceph-conf`` when setting the keyring.
+
+.. prompt:: bash #
+
+  ceph orch client-keyring set client.foo label:foo 0:0 --no-ceph-conf
+
 Disabling Management of a Keyring File
 --------------------------------------