From: Mira Limbeck <m.limbeck@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH qemu-server 1/6] cloudinit: add cloudinit section for current generated config.
Date: Wed, 31 Mar 2021 16:10:57 +0200 [thread overview]
Message-ID: <73b077df-8043-b810-4f73-3528be19d8b5@proxmox.com> (raw)
In-Reply-To: <20210328151203.2063706-2-aderumier@odiso.com>
Thank you for the patch series and the GUI patches.
Some comments inline.
On 3/28/21 5:11 PM, Alexandre Derumier wrote:
> 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.
> ---
> PVE/QemuServer.pm | 23 ++++++++++++++++++-----
> PVE/QemuServer/Cloudinit.pm | 32 ++++++++++++++++++++++++++++++++
> 2 files changed, 50 insertions(+), 5 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 57cfe62..a270104 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -1875,6 +1875,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)) {
> @@ -2135,6 +2136,7 @@ sub parse_vm_config {
> digest => Digest::SHA::sha1_hex($raw),
> snapshots => {},
> pending => {},
> + cloudinit => {},
> };
>
> $filename =~ m|/qemu-server/(\d+)\.conf$|
> @@ -2159,6 +2161,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;
> @@ -2219,7 +2226,6 @@ sub parse_vm_config {
> warn "vm $vmid - unable to parse config: $line\n";
> }
> }
> -
> if (defined($descr)) {
> $descr =~ s/\s+$//;
> $conf->{description} = $descr;
> @@ -2256,7 +2262,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"
> @@ -2280,8 +2286,10 @@ sub write_vm_config {
>
> &$cleanup_config($conf->{pending}, 1);
>
> + &$cleanup_config($conf->{cloudinit}, 1);
> +
> foreach my $snapname (keys %{$conf->{snapshots}}) {
> - die "internal error: snapshot name '$snapname' is forbidden" if lc($snapname) eq 'pending';
> + die "internal error: snapshot name '$snapname' is forbidden" if lc($snapname) =~ m/^(pending|cloudinit)$/;
This should be 'special:cloudinit', currently you can't create a
snapshot with the name 'cloudinit'.
Also there's a trailing whitespace at the end.
> &$cleanup_config($conf->{snapshots}->{$snapname}, undef, $snapname);
> }
>
> @@ -2310,7 +2318,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;
> @@ -2323,6 +2331,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}, 1);
> + }
> +
> foreach my $snapname (sort keys %{$conf->{snapshots}}) {
> $raw .= "\n[$snapname]\n";
> $raw .= &$generate_raw_config($conf->{snapshots}->{$snapname});
> @@ -4702,9 +4715,9 @@ sub vmconfig_apply_pending {
> $conf->{$opt} = delete $conf->{pending}->{$opt};
> }
> }
> -
> # write all changes at once to avoid unnecessary i/o
> PVE::QemuConfig->write_config($vmid, $conf);
> +
> }
>
> sub vmconfig_update_net {
> diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
> index c464bf3..f4bf925 100644
> --- a/PVE/QemuServer/Cloudinit.pm
> +++ b/PVE/QemuServer/Cloudinit.pm
> @@ -570,6 +570,38 @@ 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';
> +
> + foreach my $opt (@cloudinit_opts) {
> +
> + if ($opt =~ m/^ipconfig(\d+)/) {
> + my $netid = "net$1";
> + next if !defined($conf->{$netid});
> + $conf->{cloudinit}->{$netid} = $conf->{$netid};
> + }
trailing whitespace
> +
> + $conf->{cloudinit}->{$opt} = $conf->{$opt} if $conf->{$opt};
trailing whitespace
> + }
> +
> + $conf->{cloudinit}->{name} = "VM$vmid" if !$conf->{cloudinit}->{name};
> +
> + foreach 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 {
next prev parent reply other threads:[~2021-03-31 14:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-28 15:11 [pve-devel] [PATCH qemu-server 0/6] cloudinit pending behaviour change Alexandre Derumier
2021-03-28 15:11 ` [pve-devel] [PATCH qemu-server 1/6] cloudinit: add cloudinit section for current generated config Alexandre Derumier
2021-03-31 14:10 ` Mira Limbeck [this message]
2021-04-01 8:54 ` Thomas Lamprecht
2021-04-01 10:22 ` aderumier
2021-04-02 9:22 ` aderumier
2021-04-04 12:12 ` alexandre derumier
2021-03-28 15:11 ` [pve-devel] [PATCH qemu-server 2/6] generate cloudinit drive on offline plug Alexandre Derumier
2021-03-28 15:12 ` [pve-devel] [PATCH qemu-server 3/6] cloudinit: make cloudnit options fastplug Alexandre Derumier
2021-03-28 15:12 ` [pve-devel] [PATCH qemu-server 4/6] api2: add cloudinit config api Alexandre Derumier
2021-03-31 14:13 ` Mira Limbeck
2021-03-31 17:32 ` aderumier
2021-04-01 0:16 ` aderumier
2021-03-28 15:12 ` [pve-devel] [PATCH qemu-server 5/6] api2: add cloudinit_update Alexandre Derumier
2021-03-28 15:12 ` [pve-devel] [PATCH qemu-server 6/6] add cloudinit hotplug Alexandre Derumier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73b077df-8043-b810-4f73-3528be19d8b5@proxmox.com \
--to=m.limbeck@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox