reorder keyring used by ceph-crash favoring non-host-specific keyring

This patch makes it so that `ceph-crash` attempts to use the
non-host-specific keyring before anything else, which avoids
unnecessary error messages landing in the systemd-journal in our case.

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Reviewed-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Max Carrara 2024-03-05 16:07:44 +01:00 committed by Thomas Lamprecht
parent 01e4a3cd84
commit 6fb7442deb
2 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,30 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Max Carrara <m.carrara@proxmox.com>
Date: Mon, 5 Feb 2024 11:44:14 +0100
Subject: [PATCH] ceph-crash: change order of client names
This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'.
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
---
src/ceph-crash.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ceph-crash.in b/src/ceph-crash.in
index 0e02837fadd..713080a4dc1 100755
--- a/src/ceph-crash.in
+++ b/src/ceph-crash.in
@@ -16,8 +16,8 @@ import time
logging.basicConfig(level=logging.INFO)
log = logging.getLogger('ceph-crash')
-auth_names = ['client.crash.%s' % socket.gethostname(),
- 'client.crash',
+auth_names = ['client.crash',
+ 'client.crash.%s' % socket.gethostname(),
'client.admin']
--
2.39.2

View File

@ -14,3 +14,4 @@
0014-rocksb-inherit-parent-cmake-cxx-flags.patch
0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch
0016-debian-recursively-adjust-permissions-of-var-lib-cep.patch
0017-ceph-crash-change-order-of-client-names.patch