From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5C2341FF143 for ; Sat, 25 Apr 2026 14:40:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0931A697; Sat, 25 Apr 2026 14:40:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.gnome.org 1111D1099AD9F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gnome.org; s=default; t=1777120346; bh=jjCXb8uqwuhmDX2auX1S4XRgEcBKIsRbC9xn8neivZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ySUNwRHZfAc3y1dfwZ0Npsftl6UDa/RX9dBbTxhzkZ3BkTHyX9KNKJ9YjzxpMkdxe TplGXNC2szISiIaYQw8sQgf5RzAhxwtoia/uz0OuJlTYhGU2rZgYnVod73cxglPnWM 4IdJJndVI0k5AhiKvKqwEsObYyiHo5LFiszp7pWM= From: Yuri Konotopov To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 1/2] cloud-init: factor out generated file preparation Date: Sat, 25 Apr 2026 16:31:23 +0400 Message-ID: <20260425123125.797431-2-ykonotopov@gnome.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260425123125.797431-1-ykonotopov@gnome.org> References: <20260425123125.797431-1-ykonotopov@gnome.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain DMARC_PASS -0.1 DMARC pass policy RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 27BCYPP6HR2OKAEKAEDJKETZERVPF255 X-Message-ID-Hash: 27BCYPP6HR2OKAEKAEDJKETZERVPF255 X-MailFrom: ykonotopov@gnome.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yuri Konotopov X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Yuri Konotopov --- src/PVE/QemuServer/Cloudinit.pm | 39 ++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/PVE/QemuServer/Cloudinit.pm b/src/PVE/QemuServer/Cloudinit.pm index c1311da8..67f83d3a 100644 --- a/src/PVE/QemuServer/Cloudinit.pm +++ b/src/PVE/QemuServer/Cloudinit.pm @@ -245,24 +245,25 @@ sub configdrive2_metadata { EOF } +sub configdrive2_network_generator { + my ($conf) = @_; + + return PVE::QemuServer::Helpers::windows_version($conf->{ostype}) + ? \&cloudbase_network_eni + : \&configdrive2_network; +} + sub generate_configdrive2 { my ($conf, $vmid, $drive, $volname, $storeid) = @_; - my ($user_data, $network_data, $meta_data, $vendor_data) = get_custom_cloudinit_files($conf); + my ($user_data, $network_data, $meta_data, $vendor_data) = + get_cloudinit_files($conf, $vmid, configdrive2_network_generator($conf)); if (PVE::QemuServer::Helpers::windows_version($conf->{ostype})) { - $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data); - $network_data = cloudbase_network_eni($conf) if !defined($network_data); - $vendor_data = '' if !defined($vendor_data); - if (!defined($meta_data)) { my $instance_id = cloudbase_gen_instance_id($user_data, $network_data); $meta_data = cloudbase_configdrive2_metadata($instance_id, $conf); } } else { - $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data); - $network_data = configdrive2_network($conf) if !defined($network_data); - $vendor_data = '' if !defined($vendor_data); - if (!defined($meta_data)) { $meta_data = configdrive2_gen_metadata($user_data, $network_data); } @@ -592,10 +593,8 @@ sub nocloud_gen_metadata { sub generate_nocloud { my ($conf, $vmid, $drive, $volname, $storeid) = @_; - my ($user_data, $network_data, $meta_data, $vendor_data) = get_custom_cloudinit_files($conf); - $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data); - $network_data = nocloud_network($conf) if !defined($network_data); - $vendor_data = '' if !defined($vendor_data); + my ($user_data, $network_data, $meta_data, $vendor_data) = + get_cloudinit_files($conf, $vmid, \&nocloud_network); if (!defined($meta_data)) { $meta_data = nocloud_gen_metadata($user_data, $network_data); @@ -616,6 +615,20 @@ sub generate_nocloud { commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'cidata'); } +sub get_cloudinit_files { + my ($conf, $vmid, $network_generator) = @_; + + my ($user_data, $network_data, $meta_data, $vendor_data); + if ($conf->{cicustom}) { + ($user_data, $network_data, $meta_data, $vendor_data) = get_custom_cloudinit_files($conf); + } + $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data); + $network_data = $network_generator->($conf) if !defined($network_data); + $vendor_data = '' if !defined($vendor_data); + + return ($user_data, $network_data, $meta_data, $vendor_data); +} + sub get_custom_cloudinit_files { my ($conf) = @_; -- 2.47.3