migration: cloudinit check: bump manager dependency and guard with cloudinit drive

The former to ensure the manager that depends on the newer
qemu-server is actually installed and the latter to avoid false
positives

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-11-16 12:45:25 +01:00
parent 6622226553
commit 71cc2c4177

View File

@ -125,9 +125,12 @@ sub prepare {
my $version = PVE::QemuServer::Helpers::get_node_pvecfg_version($self->{node}); my $version = PVE::QemuServer::Helpers::get_node_pvecfg_version($self->{node});
my $cloudinit_config = $conf->{cloudinit}; my $cloudinit_config = $conf->{cloudinit};
if (defined($cloudinit_config) && keys %$cloudinit_config && if (
!PVE::QemuServer::Helpers::pvecfg_min_version($version, 7, 2, 5)) { PVE::QemuConfig->has_cloudinit($conf) && defined($cloudinit_config)
die "target node is too old and doesn't support new cloudinit section\n"; && scalar(keys %$cloudinit_config) > 0
&& !PVE::QemuServer::Helpers::pvecfg_min_version($version, 7, 2, 13)
) {
die "target node is too old (manager <= 7.2-13) and doesn't support new cloudinit section\n";
} }
my $repl_conf = PVE::ReplicationConfig->new(); my $repl_conf = PVE::ReplicationConfig->new();