From: Zac Dover Date: Wed, 2 Sep 2020 09:19:40 +0000 (+1000) Subject: doc/cephadm: managing ceph.conf X-Git-Tag: v15.2.9~122^2~44^2~53 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e30a88e3bf509ce4e6c9be984af05b7ecc86c38d;p=ceph.git doc/cephadm: managing ceph.conf This commit repairs PR#36796, which was about updating the configuration settings in ceph.conf without touching the file directly. That commit wasn't building because of a couple of back quotes that were touching the word that followed them. So much like the princess from The Princess and The Pea is Sphinx. So careful must we always be. Fixes: https://tracker.ceph.com/issues/47265 Signed-off-by: Zac Dover (cherry picked from commit 29e8cbc49b3d904e2cf5d5eb2d632f49ba604052) --- diff --git a/doc/cephadm/operations.rst b/doc/cephadm/operations.rst index 198286a3a304..456f48628f3c 100644 --- a/doc/cephadm/operations.rst +++ b/doc/cephadm/operations.rst @@ -278,19 +278,30 @@ You can disable this health warning with:: /etc/ceph/ceph.conf =================== -Cephadm uses a minimized ``ceph.conf`` that only contains +Cephadm distributes a minimized ``ceph.conf`` that only contains a minimal set of information to connect to the Ceph cluster. -To update the configuration settings, use:: +To update the configuration settings, instead of manually editing +the ``ceph.conf`` file, use the config database instead:: ceph config set ... +See :ref:`ceph-conf-database` for details. -To set up an initial configuration before calling -`bootstrap`, create an initial ``ceph.conf`` file. For example:: +By default, cephadm does not deploy that minimized ``ceph.conf`` across the +cluster. To enable the management of ``/etc/ceph/ceph.conf`` files on all +hosts, please enable this by running:: + + ceph config set mgr mgr/cephadm/manage_etc_ceph_ceph_conf true + +To set up an initial configuration before bootstrapping +the cluster, create an initial ``ceph.conf`` file. For example:: cat < /etc/ceph/ceph.conf [global] osd crush chooseleaf type = 0 EOF + +Then, run bootstrap referencing this file:: + cephadm bootstrap -c /root/ceph.conf ... diff --git a/doc/rados/configuration/ceph-conf.rst b/doc/rados/configuration/ceph-conf.rst index 34661c43c62c..6a8d47723d4a 100644 --- a/doc/rados/configuration/ceph-conf.rst +++ b/doc/rados/configuration/ceph-conf.rst @@ -331,6 +331,8 @@ like secret = "i love \# and \[" +.. _ceph-conf-database: + Monitor configuration database ==============================