This allow to regenerate config drive if pending values exist
when we change vm options.
---
PVE/QemuServer.pm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 59f90c9..eaad21a 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -287,7 +287,7 @@ my $confdesc = {
hotplug => {
optional => 1,
type => 'string', format => 'pve-hotplug-features',
- 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 completely. Value '1' is an alias for the
default 'network,disk,usb'.",
+ description => "Selectively enable hotplug features. This is a comma
separated list of hotplug features: 'network', 'disk', 'cpu', 'memory', 'usb'
and 'cloudinit'. Use '0' to disable hotplug completely. Value '1' is an alias
for the default 'network,disk,usb'.",
default => 'network,disk,usb',
},
reboot => {
@@ -1298,7 +1298,7 @@ sub parse_hotplug_features {
$data = $confdesc->{hotplug}->{default} if $data eq '1';
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;
} else {
die "invalid hotplug feature '$feature'\n";
@@ -4601,8 +4601,17 @@ sub vmconfig_hotplug_pending {
delete $conf->{pending}->{$opt};
}
}
-
PVE::QemuConfig->write_config($vmid, $conf);
+
+ if($hotplug_features->{cloudinit}) {
+ my $pending = PVE::QemuServer::Cloudinit::get_pending_config($conf,
$vmid);
+ my $regenerate = undef;
+ foreach my $opt (keys %{$pending}) {
+ my $item = $pending->{$opt};
+ $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 {
--
2.20.1
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
