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 1B8D592A2 for ; Thu, 17 Nov 2022 14:34:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 918442CEC1 for ; Thu, 17 Nov 2022 14:34:07 +0100 (CET) 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 for ; Thu, 17 Nov 2022 14:34:06 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8433C445D9 for ; Thu, 17 Nov 2022 14:34:06 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 17 Nov 2022 14:33:40 +0100 Message-Id: <20221117133346.737686-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221117133346.737686-1-f.gruenbichler@proxmox.com> References: <20221117133346.737686-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.138 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v7 1/7] pending changes: allow skipping cloud-init 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: Thu, 17 Nov 2022 13:34:38 -0000 in case of remote migration, we use the `update_vm_api` helper for checking permissions on the incoming config. this would also cause an incoming cloud-init image to be overwritten, since the VM is not running yet at this point. provide a parameter which can be set by an incoming *remote* migration to avoid having inconsistent cloud init images on the source and target side. Signed-off-by: Fabian Grünbichler --- Notes: new in v7 PVE/QemuServer.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index dd3d3512..dea5f251 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5193,7 +5193,7 @@ sub vmconfig_delete_or_detach_drive { sub vmconfig_apply_pending { - my ($vmid, $conf, $storecfg, $errors) = @_; + my ($vmid, $conf, $storecfg, $errors, $skip_cloud_init) = @_; return if !scalar(keys %{$conf->{pending}}); @@ -5226,7 +5226,7 @@ sub vmconfig_apply_pending { PVE::QemuConfig->cleanup_pending($conf); - my $generate_cloudnit = undef; + my $generate_cloudnit = $skip_cloud_init ? 0 : undef; foreach my $opt (keys %{$conf->{pending}}) { # add/change next if $opt eq 'delete'; # just to be sure @@ -5241,7 +5241,7 @@ sub vmconfig_apply_pending { if (is_valid_drivename($opt)) { my $drive = parse_drive($opt, $conf->{pending}->{$opt}); - $generate_cloudnit = 1 if drive_is_cloudinit($drive); + $generate_cloudnit //= 1 if drive_is_cloudinit($drive); } $conf->{$opt} = delete $conf->{pending}->{$opt}; -- 2.30.2