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 7693A1FF183 for ; Wed, 16 Jul 2025 15:00:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2E083F235; Wed, 16 Jul 2025 15:02:01 +0200 (CEST) From: Hannes Duerr To: pve-devel@lists.proxmox.com Date: Wed, 16 Jul 2025 15:01:17 +0200 Message-ID: <20250716130117.71785-1-h.duerr@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.077 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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-storage v2] RBDPlugin: add missing check for external ceph cluster 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" In 7684225 ("ceph/rbd: set 'keyring' in ceph configuration for externally managed RBD storages") the ceph config creation was packed into a new function and checked whether the installation is an external Ceph cluster or not. However, a check was forgotten in the RBDPlugin which is now added. Without this check a configuration in /etc/pve/priv/ceph/.conf is created and pvestatd complains pvestatd[1144]: ignoring custom ceph config for storage 'pool', 'monhost' is not set (assuming pveceph managed cluster)! because the file /etc/pve/priv/ceph/pool.conf Fixes: 7684225 ("ceph/rbd: set 'keyring' in ceph configuration for externally managed RBD storages") Signed-off-by: Hannes Duerr Reviewed-by: Fiona Ebner --- src/PVE/Storage/RBDPlugin.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index ce7db50..f8199a9 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -457,8 +457,10 @@ sub options { sub on_add_hook { my ($class, $storeid, $scfg, %param) = @_; + my $pveceph_managed = !defined($scfg->{monhost}); + PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid, $param{keyring}); - PVE::CephConfig::ceph_create_configuration($scfg->{type}, $storeid); + PVE::CephConfig::ceph_create_configuration($scfg->{type}, $storeid) if !$pveceph_managed; return; } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel