From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 69C401FF146 for ; Tue, 23 Jun 2026 15:45:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2A71537C84; Tue, 23 Jun 2026 15:45:10 +0200 (CEST) From: "Max R. Carrara" 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 Message-ID: <20260623134454.710441-5-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260623134454.710441-1-m.carrara@proxmox.com> References: <20260623134454.710441-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1782222291844 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: MYLV6WH62QO5VFE54P6KAMRP22I64K45 X-Message-ID-Hash: MYLV6WH62QO5VFE54P6KAMRP22I64K45 X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ... by using the new, more generic `create_or_update_keyring_file()` helper sub. Signed-off-by: Max R. Carrara --- 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