which will be a hard error (i.e. section will be skipped when parsing) in PVE
7.0
Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
---
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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
