From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, aderumier@odiso.com
Subject: Re: [pve-devel] [PATCH v6 qemu-server 4/9] cloudinit: add cloudinit section for current generated config.
Date: Tue, 21 Jun 2022 13:45:09 +0200 [thread overview]
Message-ID: <11ae62a8-355b-41bc-5763-2c48ccd1b1e0@proxmox.com> (raw)
In-Reply-To: <20220620104502.1239272-5-aderumier@odiso.com>
Am 20.06.22 um 12:44 schrieb Alexandre Derumier:
> 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>
> ---
> PVE/QemuServer.pm | 20 +++++++++++++++++---
> PVE/QemuServer/Cloudinit.pm | 31 +++++++++++++++++++++++++++++++
> 2 files changed, 48 insertions(+), 3 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index b3964bc..9f550d9 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -2504,7 +2511,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"
> @@ -2528,6 +2535,8 @@ sub write_vm_config {
>
> &$cleanup_config($conf->{pending}, 1);
>
> + &$cleanup_config($conf->{cloudinit}, 1);
As noted in the review of v4 already:
The second parameter should not be 1 here (it's called $pending and used
to check if the key 'delete' is allowed).
> +
> 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);
> @@ -2571,6 +2580,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);
Similar here, setting the second parameter is specific to pending.
> + }
> +
> foreach my $snapname (sort keys %{$conf->{snapshots}}) {
> $raw .= "\n[$snapname]\n";
> $raw .= &$generate_raw_config($conf->{snapshots}->{$snapname});
> @@ -5102,9 +5116,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);
> +
Style nit: unrelated and doesn't make it better IMHO.
> }
>
> sub vmconfig_update_net {
next prev parent reply other threads:[~2022-06-21 11:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 10:44 [pve-devel] [PATCH v6 qemu-server 0/9] cloudinit pending behaviour change Alexandre Derumier
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 1/9] qemuconfig: load_current_config : delete cloudinit value Alexandre Derumier
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 2/9] vzdump : skip special:cloudinit section Alexandre Derumier
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 3/9] migration: test targetnode min version for cloudinit section Alexandre Derumier
2022-06-21 11:45 ` Fabian Ebner
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 4/9] cloudinit: add cloudinit section for current generated config Alexandre Derumier
2022-06-21 11:45 ` Fabian Ebner [this message]
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 5/9] generate cloudinit drive on offline plug Alexandre Derumier
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 6/9] cloudinit: make cloudnit options fastplug Alexandre Derumier
2022-06-20 10:45 ` [pve-devel] [PATCH v6 qemu-server 7/9] api2: add cloudinit config api Alexandre Derumier
2022-06-21 11:45 ` Fabian Ebner
2022-06-20 10:45 ` [pve-devel] [PATCH v6 qemu-server 8/9] api2: add cloudinit_update Alexandre Derumier
2022-06-20 10:45 ` [pve-devel] [PATCH v6 qemu-server 9/9] add cloudinit hotplug Alexandre Derumier
2022-06-21 11:44 ` [pve-devel] [PATCH v6 qemu-server 0/9] cloudinit pending behaviour change Fabian Ebner
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=11ae62a8-355b-41bc-5763-2c48ccd1b1e0@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=aderumier@odiso.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