proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-16 08:19:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Constantin Herold <proxmox8914@herold.me>
Reviewed-by: Mira Limbeck <m.limbeck@proxmox.com>
This commit is contained in:
Constantin Herold 2021-10-30 16:49:41 +02:00 committed by Thomas Lamprecht
parent 33f8b88782
commit 101beafe0d
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuServer.pm
View File

@ -734,6 +734,14 @@ my $cicustom_fmt = {
format => 'pve-volume-id', format => 'pve-volume-id',
format_description => 'volume', 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);

25
PVE/QemuServer/Cloudinit.pm
View File

@ -227,17 +227,22 @@ EOF
sub generate_configdrive2 { sub generate_configdrive2 {
my ($conf, $vmid, $drive, $volname, $storeid) = @_; 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); $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data);
$network_data = configdrive2_network($conf) if !defined($network_data); $network_data = configdrive2_network($conf) if !defined($network_data);
if (!defined($meta_data)) { if (!defined($meta_data)) {
$meta_data = configdrive2_gen_metadata($user_data, $network_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 = { my $files = {
'/openstack/latest/user_data' => $user_data, '/openstack/latest/user_data' => $user_data,
'/openstack/content/0000' => $network_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 { sub generate_nocloud {
my ($conf, $vmid, $drive, $volname, $storeid) = @_; 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); $user_data = cloudinit_userdata($conf, $vmid) if !defined($user_data);
$network_data = nocloud_network($conf) if !defined($network_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 = { my $files = {
'/user-data' => $user_data, '/user-data' => $user_data,
'/network-config' => $network_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 $network_volid = $files->{network};
my $user_volid = $files->{user}; my $user_volid = $files->{user};
my $meta_volid = $files->{meta}; 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 {