cloudinit: remove pending delete on online regenerate image

currently only pending changes are applied when we regenerate
image on a running vm, but not the pending delete.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 4d4efd9f02639c7fadd6cc1cc241775b9030019f..f401baffc5e5e9a26b783aa997669b514d03a064 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4462,6 +4462,13 @@ sub vmconfig_hotplug_pending {
            $conf->{$opt} = delete $conf->{pending}->{$opt};
        }
 
+       my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete});
+       foreach my $opt (sort keys %$pending_delete_hash) {
+           next if !grep { $_ eq $opt } @cloudinit_opts;
+           PVE::QemuConfig->remove_from_pending_delete($conf, $opt);
+           delete $conf->{$opt};
+       }
+
        my $new_conf = { %$conf };
        $new_conf->{$key} = $value;
        PVE::QemuServer::Cloudinit::generate_cloudinitconfig($new_conf, $vmid);