From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 015801FF16F for ; Tue, 16 Sep 2025 19:20:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2A1819C70; Tue, 16 Sep 2025 19:20:54 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Date: Tue, 16 Sep 2025 19:20:05 +0200 Message-ID: <20250916172012.739807-5-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250916172012.739807-1-m.carrara@proxmox.com> References: <20250916172012.739807-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758043245319 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.088 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 Subject: [pve-devel] [PATCH pve-manager master v1 4/6] ceph: tools: simplify helper sub for crash keyring file X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" ... 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 afff1a0a..b6430f79 100644 --- a/PVE/Ceph/Tools.pm +++ b/PVE/Ceph/Tools.pm @@ -541,33 +541,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 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel