From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0CB2170467 for ; Tue, 21 Jun 2022 13:45:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 035654B03 for ; Tue, 21 Jun 2022 13:45:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 66E7A4AF6 for ; Tue, 21 Jun 2022 13:45:10 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3EF3343C3D; Tue, 21 Jun 2022 13:45:10 +0200 (CEST) Message-ID: <11ae62a8-355b-41bc-5763-2c48ccd1b1e0@proxmox.com> Date: Tue, 21 Jun 2022 13:45:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, aderumier@odiso.com References: <20220620104502.1239272-1-aderumier@odiso.com> <20220620104502.1239272-5-aderumier@odiso.com> From: Fabian Ebner In-Reply-To: <20220620104502.1239272-5-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cloudinit.pm, qemuserver.pm] Subject: Re: [pve-devel] [PATCH v6 qemu-server 4/9] cloudinit: add cloudinit section for current generated config. X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2022 11:45:41 -0000 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 > --- > 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 {