fix #2429: allow to specify cloud-init vendor snippet via cicustom

Signed-off-by: Constantin Herold <proxmox8914@herold.me>
Reviewed-by: Mira Limbeck <m.limbeck@proxmox.com>

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 8e368489353b0f2ff2b282ca77c7941b3d7096bb..581d1d6f18842aac08747950af1df8395b72c362 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -734,6 +734,14 @@ my $cicustom_fmt = {
        format => 'pve-volume-id',
        format_description => 'volume',
     },
        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);
 
 };
 PVE::JSONSchema::register_format('pve-qm-cicustom', $cicustom_fmt);
 

diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 9dc46aec425dd716f4e75777fd463142acbd3477..420566e798ea607517e5974bdfeb3c87f2e960e3 100644 (file)
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -227,17 +227,22 @@ EOF
 sub generate_configdrive2 {
     my ($conf, $vmid, $drive, $volname, $storeid) = @_;
 
 sub generate_configdrive2 {
     my ($conf, $vmid, $drive, $volname, $storeid) = @_;
 

-    my ($user_data, $network_data, $meta_data) = get_custom_cloudinit_files($conf);
+    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 = configdrive2_network($conf) if !defined($network_data);
 
     if (!defined($meta_data)) {
        $meta_data = configdrive2_gen_metadata($user_data, $network_data);
     }
     $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data);
     $network_data = configdrive2_network($conf) if !defined($network_data);
 
     if (!defined($meta_data)) {
        $meta_data = configdrive2_gen_metadata($user_data, $network_data);
     }

+
+    my $sum = length($user_data) + length($network_data) + length($meta_data) + length($vendor_data);
+    die "Cloud-Init sum of snippets too big (> 3 MiB)\n" if $sum > (3 * 1024 * 1024);
+

     my $files = {
        '/openstack/latest/user_data' => $user_data,
        '/openstack/content/0000' => $network_data,
     my $files = {
        '/openstack/latest/user_data' => $user_data,
        '/openstack/content/0000' => $network_data,

-       '/openstack/latest/meta_data.json' => $meta_data
+       '/openstack/latest/meta_data.json' => $meta_data,
+       '/openstack/latest/vendor_data.json' => $vendor_data

     };
     commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'config-2');
 }
     };
     commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'config-2');
 }


@@ -476,7 +481,7 @@ sub nocloud_gen_metadata {
 sub generate_nocloud {
     my ($conf, $vmid, $drive, $volname, $storeid) = @_;
 
 sub generate_nocloud {
     my ($conf, $vmid, $drive, $volname, $storeid) = @_;
 

-    my ($user_data, $network_data, $meta_data) = get_custom_cloudinit_files($conf);
+    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);
 
     $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data);
     $network_data = nocloud_network($conf) if !defined($network_data);
 


@@ -484,10 +489,14 @@ sub generate_nocloud {
        $meta_data = nocloud_gen_metadata($user_data, $network_data);
     }
 
        $meta_data = nocloud_gen_metadata($user_data, $network_data);
     }
 

+    my $sum = length($user_data) + length($network_data) + length($meta_data) + length($vendor_data);
+    die "Cloud-Init sum of snippets too big (> 3 MiB)\n" if $sum > (3 * 1024 * 1024);
+

     my $files = {
        '/user-data' => $user_data,
        '/network-config' => $network_data,
     my $files = {
        '/user-data' => $user_data,
        '/network-config' => $network_data,

-       '/meta-data' => $meta_data
+       '/meta-data' => $meta_data,
+       '/vendor-data' => $vendor_data

     };
     commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'cidata');
 }
     };
     commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'cidata');
 }


@@ -501,6 +510,7 @@ sub get_custom_cloudinit_files {
     my $network_volid = $files->{network};
     my $user_volid = $files->{user};
     my $meta_volid = $files->{meta};
     my $network_volid = $files->{network};
     my $user_volid = $files->{user};
     my $meta_volid = $files->{meta};

+    my $vendor_volid = $files->{vendor};

 
     my $storage_conf = PVE::Storage::config();
 
 
     my $storage_conf = PVE::Storage::config();
 


@@ -519,7 +529,12 @@ sub get_custom_cloudinit_files {
        $meta_data = read_cloudinit_snippets_file($storage_conf, $meta_volid);
     }
 
        $meta_data = read_cloudinit_snippets_file($storage_conf, $meta_volid);
     }
 

-    return ($user_data, $network_data, $meta_data);
+    my $vendor_data;
+    if ($vendor_volid) {
+       $vendor_data = read_cloudinit_snippets_file($storage_conf, $vendor_volid);
+    }
+
+    return ($user_data, $network_data, $meta_data, $vendor_data);

 }
 
 sub read_cloudinit_snippets_file {
 }
 
 sub read_cloudinit_snippets_file {