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

Partially-revert "cloudinit: add cloudinit section for current generated config"

Browse Source 
This partially reverts commit 95a5135dad.
Particularly the unprotected write to the config when
generating the cloudinit file. We leave the rest as is for
now and update the callers to deal with the config later.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-11-16 18:14:04 +01:00 committed by Thomas Lamprecht
parent 3de134ef4a
commit 0337d531a0
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PVE/QemuServer/Cloudinit.pm
View File

@ -576,37 +576,6 @@ sub generate_cloudinitconfig {
$generator->($conf, $vmid, $drive, $volname, $storeid);
});
my $cloudinitconf = delete $conf->{cloudinit};
$cloudinitconf = {};
my @cloudinit_opts = keys %{PVE::QemuServer::cloudinit_config_properties()};
push @cloudinit_opts, 'name';
for my $opt (@cloudinit_opts) {
if ($opt =~ m/^ipconfig(\d+)/) {
my $netid = "net$1";
next if !defined($conf->{$netid});
$conf->{cloudinit}->{$netid} = $conf->{$netid};
}
$conf->{cloudinit}->{$opt} = $conf->{$opt} if $conf->{$opt};
}
$conf->{cloudinit}->{name} = "VM$vmid" if !$conf->{cloudinit}->{name};
for my $opt (keys %{$conf}) {
if (PVE::QemuServer::is_valid_drivename($opt)) {
my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
if (PVE::QemuServer::drive_is_cloudinit($drive)) {
$conf->{cloudinit}->{$opt} = $conf->{$opt};
}
}
}
PVE::QemuConfig->write_config($vmid, $conf);
}
sub dump_cloudinit_config {