From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 43E3F93705 for ; Mon, 5 Feb 2024 18:55:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2277B1B4B2 for ; Mon, 5 Feb 2024 18:54:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 5 Feb 2024 18:54:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9A75F4448A for ; Mon, 5 Feb 2024 18:54:31 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Mon, 5 Feb 2024 18:54:15 +0100 Message-Id: <20240205175419.1271680-8-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240205175419.1271680-1-m.carrara@proxmox.com> References: <20240205175419.1271680-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 pve-storage 07/11] amend! cephconfig: allow writing arbitrary sections 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: , X-List-Received-Date: Mon, 05 Feb 2024 17:55:02 -0000 cephconfig: allow writing arbitrary sections This adds support for writing arbitrary sections to 'ceph.conf' while ensuring that already written sections are not duplicated. Sections that are associated with the client, for example '[client.foo]', are written directly after the '[client]' section. Sections associated with 'mds', 'mon', 'osd' and 'mgr' are also written directly after their associated section. Signed-off-by: Max Carrara --- NOTE: This amend really just changes the order of the sections below and may be dropped if not desired. Changes v1 --> v2: * new src/PVE/CephConfig.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm index 86d3079..00b1f35 100644 --- a/src/PVE/CephConfig.pm +++ b/src/PVE/CephConfig.pm @@ -82,17 +82,20 @@ sub write_ceph_config { }; &$cond_write_sec('global'); + &$cond_write_sec('client'); &$cond_write_sec('client\..*'); &$cond_write_sec('mds'); - &$cond_write_sec('mon'); - &$cond_write_sec('osd'); - &$cond_write_sec('mgr'); - &$cond_write_sec('mds\..*'); + + &$cond_write_sec('mon'); &$cond_write_sec('mon\..*'); + + &$cond_write_sec('osd'); &$cond_write_sec('osd\..*'); + + &$cond_write_sec('mgr'); &$cond_write_sec('mgr\..*'); &$cond_write_sec('.*'); -- 2.39.2