From 6adad3bcfcac294862518afdd2cbc0e478fb6b3c Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Mon, 23 May 2022 11:14:05 +0200 Subject: [PATCH] doc/cephadm: document the new per-fsid cephadm conf location Fixes: https://tracker.ceph.com/issues/55357 Signed-off-by: Redouane Kachach (cherry picked from commit 443f93e95d8068a31526730da0febd692b87b7a5) --- doc/cephadm/host-management.rst | 4 +++- doc/cephadm/operations.rst | 21 +++++++++++++++------ doc/man/8/cephadm.rst | 11 +++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/doc/cephadm/host-management.rst b/doc/cephadm/host-management.rst index f342558fafcb7..c1534b6132ced 100644 --- a/doc/cephadm/host-management.rst +++ b/doc/cephadm/host-management.rst @@ -161,7 +161,9 @@ The following host labels have a special meaning to cephadm. All start with ``_ bootstrap was originally run), and the ``client.admin`` key is set to be distributed to that host via the ``ceph orch client-keyring ...`` function. Adding this label to additional hosts will normally cause cephadm to deploy config and keyring files - in ``/etc/ceph``. + in ``/etc/ceph``. Starting from versions 16.2.10 (Pacific) and 17.2.1 (Quincy) in + addition to the default location ``/etc/ceph/`` cephadm also stores config and keyring + files in the ``/var/lib/ceph//config`` directory. Maintenance Mode ================ diff --git a/doc/cephadm/operations.rst b/doc/cephadm/operations.rst index fb7d5481df92e..9ec8371c89ad0 100644 --- a/doc/cephadm/operations.rst +++ b/doc/cephadm/operations.rst @@ -395,25 +395,34 @@ process is active within the cluster.* CEPHADM_CHECK_KERNEL_VERSION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The OS kernel version (maj.min) is checked for consistency across the hosts. -The kernel version of the majority of the hosts is used as the basis for +The kernel version of the majority of the hosts is used as the basis for identifying anomalies. .. _client_keyrings_and_configs: Client keyrings and configs =========================== - Cephadm can distribute copies of the ``ceph.conf`` file and client keyring -files to hosts. It is usually a good idea to store a copy of the config and -``client.admin`` keyring on any host used to administer the cluster via the -CLI. By default, cephadm does this for any nodes that have the ``_admin`` -label (which normally includes the bootstrap host). +files to hosts. Starting from versions 16.2.10 (Pacific) and 17.2.1 (Quincy), +in addition to the default location ``/etc/ceph/`` cephadm also stores config +and keyring files in the ``/var/lib/ceph//config`` directory. It is usually +a good idea to store a copy of the config and ``client.admin`` keyring on any host +used to administer the cluster via the CLI. By default, cephadm does this for any +nodes that have the ``_admin`` label (which normally includes the bootstrap host). + +.. note:: Ceph daemons will still use files on ``/etc/ceph/``. The new configuration + location ``/var/lib/ceph//config`` is used by cephadm only. Having this config + directory under the fsid helps cephadm to load the configuration associated with + the cluster. + When a client keyring is placed under management, cephadm will: - build a list of target hosts based on the specified placement spec (see :ref:`orchestrator-cli-placement-spec`) - store a copy of the ``/etc/ceph/ceph.conf`` file on the specified host(s) + - store a copy of the ``ceph.conf`` file at ``/var/lib/ceph//config/ceph.conf`` on the specified host(s) + - store a copy of the ``ceph.client.admin.keyring`` file at ``/var/lib/ceph//config/ceph.client.admin.keyring`` on the specified host(s) - store a copy of the keyring file on the specified host(s) - update the ``ceph.conf`` file as needed (e.g., due to a change in the cluster monitors) - update the keyring file if the entity's key is changed (e.g., via ``ceph diff --git a/doc/man/8/cephadm.rst b/doc/man/8/cephadm.rst index ebcc3a6a2719b..b34d5dc5281b1 100644 --- a/doc/man/8/cephadm.rst +++ b/doc/man/8/cephadm.rst @@ -194,6 +194,17 @@ Arguments: * [--skip-firewalld] Do not configure firewalld * [--skip-pull] do not pull the latest image before adopting +Configuration: + +When starting the shell, cephadm looks for configuration in the following order. +Only the first values found are used: + +1. An explicit, user provided path to a config file (``-c/--config`` option) +2. Config file for daemon specified with ``--name`` parameter (``/var/lib/ceph///config``) +3. ``/var/lib/ceph//config/ceph.conf`` if it exists +4. The config file for a ``mon`` daemon (``/var/lib/ceph//mon./config``) if it exists +5. Finally: fallback to the default file ``/etc/ceph/ceph.conf`` + bootstrap --------- -- 2.39.5