From: "Max R. Carrara" <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v4 4/7] ceph: tools: simplify helper sub for crash keyring file
Date: Tue, 23 Jun 2026 15:44:34 +0200 [thread overview]
Message-ID: <20260623134454.710441-5-m.carrara@proxmox.com> (raw)
In-Reply-To: <20260623134454.710441-1-m.carrara@proxmox.com>
... by using the new, more generic `create_or_update_keyring_file()`
helper sub.
Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
PVE/Ceph/Tools.pm | 34 ++++++++--------------------------
1 file changed, 8 insertions(+), 26 deletions(-)
diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm
index 5ea002e4..07284661 100644
--- a/PVE/Ceph/Tools.pm
+++ b/PVE/Ceph/Tools.pm
@@ -542,33 +542,15 @@ my sub create_or_update_keyring_file {
sub create_or_update_crash_keyring_file {
my ($rados) = @_;
- if (!defined($rados)) {
- $rados = PVE::RADOS->new();
- }
+ my $entity = 'client.crash';
+ my $caps = [
+ mon => 'profile crash',
+ mgr => 'profile crash',
+ ];
- my $output = $rados->mon_command({
- prefix => 'auth get-or-create',
- entity => 'client.crash',
- caps => [
- mon => 'profile crash',
- mgr => 'profile crash',
- ],
- format => 'plain',
- });
-
- if (-f $pve_ceph_crash_key_path) {
- my $contents = PVE::Tools::file_get_contents($pve_ceph_crash_key_path);
-
- if ($contents ne $output) {
- PVE::Tools::file_set_contents($pve_ceph_crash_key_path, $output);
- return 1;
- }
- } else {
- PVE::Tools::file_set_contents($pve_ceph_crash_key_path, $output);
- return 1;
- }
-
- return 0;
+ return create_or_update_keyring_file(
+ $pve_ceph_crash_key_path, $entity, $caps, $rados,
+ );
}
# is also used in `pve-ceph-keyring` helper
--
2.47.3
next prev parent reply other threads:[~2026-06-23 13:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-23 13:44 [PATCH ceph master/ceph squid/manager v4 0/7] Fix #6816: Prevent ceph-exporter Daemon from Crashing on Startup Max R. Carrara
2026-06-23 13:44 ` [PATCH pve-manager v4 1/7] ceph: tools: add helper sub for creating or updating keyring files Max R. Carrara
2026-06-23 13:44 ` [PATCH pve-manager v4 2/7] fix #6816: api: ceph: create 'client.exporter' w/ keyring Max R. Carrara
2026-06-23 13:44 ` [PATCH pve-manager v4 3/7] fix #6816: bin: add pve-ceph-keyring helper and call it in postinst Max R. Carrara
2026-06-23 13:44 ` Max R. Carrara [this message]
2026-06-23 13:44 ` [PATCH pve-manager v4 5/7] bin: make pve-init-ceph-crash call pve-ceph-keyring Max R. Carrara
2026-06-23 13:44 ` [PATCH ceph master v4 6/7] fix #6816: patches: make ceph-exporter use custom keyring Max R. Carrara
2026-06-23 13:44 ` [PATCH ceph squid v4 7/7] " Max R. Carrara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260623134454.710441-5-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox