From: Adam King <adking@redhat.com>
Date: Thu, 4 Apr 2024 19:05:34 +0000 (-0400)
Subject: doc/cephadm: document new --no-ceph-conf flag for `orch client-keyring set`
X-Git-Tag: v20.0.0~2201^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F56713%2Fhead;p=ceph.git

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

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/doc/cephadm/operations.rst b/doc/cephadm/operations.rst
index 4ec28bc1c362..3b117c1bd6a6 100644
--- a/doc/cephadm/operations.rst
+++ b/doc/cephadm/operations.rst
@@ -601,6 +601,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
 --------------------------------------