]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
cephadm: fix handling of ceph-exporter sock-dir
authorAdam King <adking@redhat.com>
Thu, 9 Jan 2025 16:36:34 +0000 (11:36 -0500)
committerAdam King <adking@redhat.com>
Mon, 13 Jan 2025 18:28:05 +0000 (13:28 -0500)
commit3b28df83624fbd0eaa7168ecbef3c60dac9b89d6
tree7f71e82dc3f83ada8f9cba294947c40b825b75a9
parentcb47171c1c9c14959eda5ea6d8a2a25a0f219f83
cephadm: fix handling of ceph-exporter sock-dir

Fixes: https://tracker.ceph.com/issues/69475
It turns out the sock-dir for ceph-exporter only needs to
exist within the container, not on the host. Previous code,
including the validation function this commit removes
and previous patches trying to fix the ceph-exporter asok
file not appearing on the host, were all done assuming
it mattered what was on the host. This patch changes things
so all we do with the sock dir is mount it to /var/run/ceph/<fsid>
and don't worry about whether that dir exists on the host.
Additionally, the patch makes it so /var/run/ceph/<fsid> is
created during ceph-exporter deployment.

Signed-off-by: Adam King <adking@redhat.com>
src/cephadm/cephadmlib/daemons/ceph.py