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 86D776ECE9 for ; Thu, 26 Aug 2021 11:26:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7551E1916D for ; Thu, 26 Aug 2021 11:25:41 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 64BBF1915E for ; Thu, 26 Aug 2021 11:25:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3363C43A7B for ; Thu, 26 Aug 2021 11:25:31 +0200 (CEST) Message-ID: Date: Thu, 26 Aug 2021 11:25:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.0 Content-Language: en-GB To: Proxmox VE development discussion , Aaron Lauterer References: <20210803114556.3354407-1-a.lauterer@proxmox.com> <20210803114556.3354407-3-a.lauterer@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210803114556.3354407-3-a.lauterer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.461 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -2.24 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH v2 storage 2/2] Ceph: add keyring parameter for external clusters 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: Thu, 26 Aug 2021 09:26:11 -0000 On 03/08/2021 13:45, Aaron Lauterer wrote: patch does not applies.. > diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm > index a8d1243..4bd43d5 100644 > --- a/PVE/Storage/RBDPlugin.pm > +++ b/PVE/Storage/RBDPlugin.pm .. snip > @@ -327,20 +332,29 @@ sub options { diff # do not seem to match even with below bogus `gg` line removed > sub on_add_hook { > my ($class, $storeid, $scfg, %param) = @_; > > - return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph > + my $secret = $param{keyring} if defined $param{keyring} // undef; > + PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid, $secret); > > - PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid); > + return; > +} > + > +sub on_update_hook { > + my ($class, $storeid, $scfg, %param) = @_; > + > + if (exists($param{keyring})) { > + if (defined($param{keyring})) { > + PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid, $param{keyring}); > + } else { > + PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid); > + } > + } > gg bogus line above, probably from a vim-go-to-top in insert mode mistake.. > return; > } > > sub on_delete_hook { > my ($class, $storeid, $scfg) = @_; > - > - return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph > - > PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid); > - > return; > } > >