proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-23 18:30:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pve6to7: check for misconfigured content type 'none'

Browse Source 
which will be a hard error (i.e. section will be skipped when parsing) in PVE
7.0

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-06-21 16:31:40 +02:00 committed by Thomas Lamprecht
parent 6f361f8064
commit d12bbda5c5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/CLI/pve6to7.pm
View File

@ -18,6 +18,7 @@ use PVE::JSONSchema;
use PVE::NodeConfig; use PVE::NodeConfig;
use PVE::RPCEnvironment; use PVE::RPCEnvironment;
use PVE::Storage; use PVE::Storage;
use PVE::Storage::Plugin;
use PVE::Tools qw(run_command split_list); use PVE::Tools qw(run_command split_list);
use PVE::QemuConfig; use PVE::QemuConfig;
use PVE::QemuServer; use PVE::QemuServer;
@ -703,7 +704,7 @@ sub check_description_lengths {
} }
sub check_storage_content { 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; my $found;
@ -714,6 +715,13 @@ sub check_storage_content {
next if !PVE::Storage::storage_check_enabled($storage_cfg, $storeid, undef, 1); 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}->{images};
next if $scfg->{content}->{rootdir}; 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 " . log_warn("PVE 7.0 enforces stricter content type checks. Guests referencing the above " .
"volumes will not work until the storage configuration is fixed."); "volumes will not work until the storage configuration is fixed.");
} else { } else {
log_pass("none found"); log_pass("no problems found");
} }
} }