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

cloudinit: add cloudinit section for current generated config.

Browse Source 
Instead using vm pending options for pending cloudinit generated config,

write current generated cloudinit config in a new [special:cloudinit] SECTION.

Currently, some options like vm name, nic mac address can be hotplugged,
so they are not way to know if the cloud-init disk is already updated.

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:00 +02:00 committed by Thomas Lamprecht
parent 9c88e85446
commit 95a5135dad
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/QemuServer.pm
View File

@ -2002,6 +2002,7 @@ sub vmconfig_register_unused_drive {
if (drive_is_cloudinit($drive)) {
eval { PVE::Storage::vdisk_free($storecfg, $drive->{file}) };
warn $@ if $@;
delete $conf->{cloudinit};
} elsif (!drive_is_cdrom($drive)) {
my $volid = $drive->{file};
if (vm_is_volid_owner($storecfg, $vmid, $volid)) {
@ -2372,6 +2373,7 @@ sub parse_vm_config {
digest => Digest::SHA::sha1_hex($raw),
snapshots => {},
pending => {},
cloudinit => {},
};
my $handle_error = sub {
@ -2406,6 +2408,11 @@ sub parse_vm_config {
$descr = undef;
$conf = $res->{$section} = {};
next;
} elsif ($line =~ m/^\[special:cloudinit\]\s*$/i) {
$section = 'cloudinit';
$descr = undef;
$conf = $res->{$section} = {};
next;
} elsif ($line =~ m/^\[([a-z][a-z0-9_\-]+)\]\s*$/i) {
$section = $1;
@ -2503,7 +2510,7 @@ sub write_vm_config {
foreach my $key (keys %$cref) {
next if $key eq 'digest' || $key eq 'description' || $key eq 'snapshots' ||
$key eq 'snapstate' || $key eq 'pending';
$key eq 'snapstate' || $key eq 'pending' || $key eq 'cloudinit';
my $value = $cref->{$key};
if ($key eq 'delete') {
die "propertry 'delete' is only allowed in [PENDING]\n"
@ -2527,6 +2534,8 @@ sub write_vm_config {
&$cleanup_config($conf->{pending}, 1);
&$cleanup_config($conf->{cloudinit});
foreach my $snapname (keys %{$conf->{snapshots}}) {
die "internal error: snapshot name '$snapname' is forbidden" if lc($snapname) eq 'pending';
&$cleanup_config($conf->{snapshots}->{$snapname}, undef, $snapname);
@ -2557,7 +2566,7 @@ sub write_vm_config {
}
foreach my $key (sort keys %$conf) {
next if $key =~ /^(digest|description|pending|snapshots)$/;
next if $key =~ /^(digest|description|pending|cloudinit|snapshots)$/;
$raw .= "$key: $conf->{$key}\n";
}
return $raw;
@ -2570,6 +2579,11 @@ sub write_vm_config {
$raw .= &$generate_raw_config($conf->{pending}, 1);
}
if (scalar(keys %{$conf->{cloudinit}})){
$raw .= "\n[special:cloudinit]\n";
$raw .= &$generate_raw_config($conf->{cloudinit});
}
foreach my $snapname (sort keys %{$conf->{snapshots}}) {
$raw .= "\n[$snapname]\n";
$raw .= &$generate_raw_config($conf->{snapshots}->{$snapname});

31
PVE/QemuServer/Cloudinit.pm
View File

@ -574,6 +574,37 @@ 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 {