proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-08 07:45:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add cloudinit hotplug

Browse Source 
This allow to regenerate config drive if pending values exist
when we change vm options.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Alexandre Derumier 2022-06-22 13:52:05 +02:00 committed by Thomas Lamprecht
parent 9687287bb3
commit 94ec5e7c30
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/QemuServer.pm
View File

@ -297,7 +297,7 @@ my $confdesc = {
optional => 1, optional => 1,
type => 'string', format => 'pve-hotplug-features', type => 'string', format => 'pve-hotplug-features',
description => "Selectively enable hotplug features. This is a comma separated list of" description => "Selectively enable hotplug features. This is a comma separated list of"
." hotplug features: 'network', 'disk', 'cpu', 'memory' and 'usb'. Use '0' to disable" ." hotplug features: 'network', 'disk', 'cpu', 'memory', 'usb' and 'cloudinit'. Use '0' to disable"
." hotplug completely. Using '1' as value is an alias for the default `network,disk,usb`.", ." hotplug completely. Using '1' as value is an alias for the default `network,disk,usb`.",
default => 'network,disk,usb', default => 'network,disk,usb',
}, },
@ -1350,7 +1350,7 @@ sub parse_hotplug_features {
$data = $confdesc->{hotplug}->{default} if $data eq '1'; $data = $confdesc->{hotplug}->{default} if $data eq '1';
foreach my $feature (PVE::Tools::split_list($data)) { foreach my $feature (PVE::Tools::split_list($data)) {
if ($feature =~ m/^(network|disk|cpu|memory|usb)$/) { if ($feature =~ m/^(network|disk|cpu|memory|usb|cloudinit)$/) {
$res->{$1} = 1; $res->{$1} = 1;
} else { } else {
die "invalid hotplug feature '$feature'\n"; die "invalid hotplug feature '$feature'\n";
@ -4987,8 +4987,16 @@ sub vmconfig_hotplug_pending {
delete $conf->{pending}->{$opt}; delete $conf->{pending}->{$opt};
} }
} }
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
if($hotplug_features->{cloudinit}) {
my $pending = PVE::QemuServer::Cloudinit::get_pending_config($conf, $vmid);
my $regenerate = undef;
for my $item (@$pending) {
$regenerate = 1 if defined($item->{delete}) or defined($item->{pending});
}
PVE::QemuServer::vmconfig_update_cloudinit_drive($storecfg, $conf, $vmid) if $regenerate;
}
} }
sub try_deallocate_drive { sub try_deallocate_drive {