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 2257E6B31D for ; Tue, 3 Aug 2021 13:46:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B7CF12232 for ; Tue, 3 Aug 2021 13:45:59 +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 C3EA112214 for ; Tue, 3 Aug 2021 13:45:57 +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 87FCB42D33 for ; Tue, 3 Aug 2021 13:45:57 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 3 Aug 2021 13:45:54 +0200 Message-Id: <20210803114556.3354407-1-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.430 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cephconfig.pm, rbdplugin.pm, pvesm.pm, cephfsplugin.pm, config.pm] Subject: [pve-devel] [PATCH v2 storage 0/2] RBD/Cephfs: new keyring parameter 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: Tue, 03 Aug 2021 11:46:29 -0000 This new parameter allows to set the RBD keyring or CephFS secret for an external Ceph Cluster right when creating the storage. Up until now, they had to be manually placed in /etc/pve/priv/ceph/$file. In order to reuse as much code as possible, I had to adjust the PVE::CephConfig::ceph_create_keyfile method to be able to pass the secret in as parameter. changes since v1: fixed checks to avoid accidentially deleting the keyring/secret file Aaron Lauterer (2): CephConfig: add optional $secret parameter Ceph: add keyring parameter for external clusters PVE/API2/Storage/Config.pm | 2 +- PVE/CLI/pvesm.pm | 12 ++++++++++-- PVE/CephConfig.pm | 15 +++++++++------ PVE/Storage/CephFSPlugin.pm | 22 ++++++++++++++++------ PVE/Storage/RBDPlugin.pm | 26 ++++++++++++++++++++------ 5 files changed, 56 insertions(+), 21 deletions(-) -- 2.30.2