[pve-devel] [PATCH qemu-server 1/2] close #3428: remove package_upgrade

[pve-devel] [PATCH qemu-server 1/2] close #3428: remove package_upgrade

[Mira Limbeck]

Automatically updating packages on boot is not always a good idea, so
remove that setting.
The `package_upgrade` setting can still be set via snippets if required.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
 PVE/QemuServer/Cloudinit.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index a5474d3..1163915 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -144,8 +144,6 @@ sub cloudinit_userdata {
 	$content .= "  - default\n";
     }
 
-    $content .= "package_upgrade: true\n";
-
     return $content;
 }
 
-- 
2.30.2

[pve-devel] [PATCH qemu-server 2/2] cloud-init: add vendor-data

[Mira Limbeck]

Vendor data can contain the same config options as user data. When user
data is supplied that conflicts with vendor data, the user data is
chosen instead. This can help in creating a base for multiple VMs with
the same vendor data, but different user data for customization. [0]

Support for vendor data is implemented via snippets only.

[0] https://cloudinit.readthedocs.io/en/latest/topics/vendordata.html

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
 PVE/QemuServer.pm           |  8 ++++++++
 PVE/QemuServer/Cloudinit.pm | 16 ++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 25282b7..1fe1f5c 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -711,6 +711,14 @@ my $cicustom_fmt = {
 	format => 'pve-volume-id',
 	format_description => 'volume',
     },
+    vendor => {
+	type => 'string',
+	optional => 1,
+	description => 'Specify a custom file containing all vendor data passed to the VM  via'
+	    .' cloud-init.',
+	format => 'pve-volume-id',
+	format_description => 'volume',
+    },
 };
 PVE::JSONSchema::register_format('pve-qm-cicustom', $cicustom_fmt);
 
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 1163915..f428995 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -491,7 +491,7 @@ sub nocloud_gen_metadata {
 sub generate_nocloud {
     my ($conf, $vmid, $drive, $volname, $storeid) = @_;
 
-    my ($user_data, $network_data, $meta_data) = get_custom_cloudinit_files($conf);
+    my ($user_data, $vendor_data, $network_data, $meta_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);
 
@@ -499,8 +499,14 @@ sub generate_nocloud {
 	$meta_data = nocloud_gen_metadata($user_data, $network_data);
     }
 
+    # we always allocate a 4MiB disk for cloudinit and with the overhead of the ISO
+    # make sure we always stay below it by keeping the sum of all files below 3 MiB
+    my $sum = length($user_data) + length($vendor_data) + length($network_data) + length($meta_data);
+    die "Cloud-Init sum of snippets too big (> 3 MiB)\n" if $sum > (3 * 1024 * 1024);
+
     my $files = {
 	'/user-data' => $user_data,
+	'/vendor-data' => $vendor_data,
 	'/network-config' => $network_data,
 	'/meta-data' => $meta_data
     };
@@ -515,6 +521,7 @@ sub get_custom_cloudinit_files {
 
     my $network_volid = $files->{network};
     my $user_volid = $files->{user};
+    my $vendor_volid = $files->{vendor};
     my $meta_volid = $files->{meta};
 
     my $storage_conf = PVE::Storage::config();
@@ -529,12 +536,17 @@ sub get_custom_cloudinit_files {
 	$user_data = read_cloudinit_snippets_file($storage_conf, $user_volid);
     }
 
+    my $vendor_data;
+    if ($vendor_volid) {
+	$vendor_data = read_cloudinit_snippets_file($storage_conf, $vendor_volid);
+    }
+
     my $meta_data;
     if ($meta_volid) {
 	$meta_data = read_cloudinit_snippets_file($storage_conf, $meta_volid);
     }
 
-    return ($user_data, $network_data, $meta_data);
+    return ($user_data, $vendor_data, $network_data, $meta_data);
 }
 
 sub read_cloudinit_snippets_file {
-- 
2.30.2