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 23B5974603 for ; Mon, 21 Jun 2021 16:31:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 07BED1DDBD for ; Mon, 21 Jun 2021 16:31:46 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9EC841DDA6 for ; Mon, 21 Jun 2021 16:31:44 +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 78F4D41AE6 for ; Mon, 21 Jun 2021 16:31:44 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Jun 2021 16:31:40 +0200 Message-Id: <20210621143140.2022-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210621143140.2022-1-f.ebner@proxmox.com> References: <20210621143140.2022-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.702 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 Subject: [pve-devel] [PATCH v2 manager 2/2] pve6to7: check for misconfigured content type 'none' 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, 21 Jun 2021 14:31:46 -0000 which will be a hard error (i.e. section will be skipped when parsing) in PVE 7.0 Signed-off-by: Fabian Ebner --- Changes from v1: * Also change message for passing the check to match with changed initial log line PVE/CLI/pve6to7.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm index 60464861..7777aa6c 100644 --- a/PVE/CLI/pve6to7.pm +++ b/PVE/CLI/pve6to7.pm @@ -18,6 +18,7 @@ use PVE::JSONSchema; use PVE::NodeConfig; use PVE::RPCEnvironment; use PVE::Storage; +use PVE::Storage::Plugin; use PVE::Tools qw(run_command split_list); use PVE::QemuConfig; use PVE::QemuServer; @@ -703,7 +704,7 @@ sub check_description_lengths { } sub check_storage_content { - log_info("Scanning for guest images on storages without images/rootdir content type.."); + log_info("Checking storage content type configuration.."); my $found; @@ -714,6 +715,13 @@ sub check_storage_content { next if !PVE::Storage::storage_check_enabled($storage_cfg, $storeid, undef, 1); + my $valid_content = PVE::Storage::Plugin::valid_content_types($scfg->{type}); + + if (scalar(keys $scfg->{content}->%*) == 0 && !$valid_content->{none}) { + log_fail("storage '$storeid' does not support configured content type 'none'"); + delete $scfg->{content}->{none}; # scan for guest images below + } + next if $scfg->{content}->{images}; next if $scfg->{content}->{rootdir}; @@ -739,7 +747,7 @@ sub check_storage_content { log_warn("PVE 7.0 enforces stricter content type checks. Guests referencing the above " . "volumes will not work until the storage configuration is fixed."); } else { - log_pass("none found"); + log_pass("no problems found"); } } -- 2.20.1