proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-28 14:18:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: create disks: avoid adding secondary cloud-init drives

Browse Source 
This will break possibly existing workflows like
1. add second cloud-init
2. remove first cloud-init
to change the cloud-init storage.

On the other hand, it avoids unintended misconfiguration of having
mutliple cloud-init drives with potentially different settings.

Also in preparation for adding cloud-init-related API calls, where
not being able to assume that there's only one cloud-init drive/state
would complicate things quite a bit.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2022-05-06 12:11:14 +02:00 committed by Thomas Lamprecht
parent d064764a70
commit 39b56b169a
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/API2/Qemu.pm
View File

@ -328,6 +328,15 @@ my $create_disks = sub {
} elsif (defined($volname) && $volname eq 'cloudinit') {
$storeid = $storeid // $default_storage;
die "no storage ID specified (and no default storage)\n" if !$storeid;
if (
my $ci_key = PVE::QemuConfig->has_cloudinit($conf, $ds)
|| PVE::QemuConfig->has_cloudinit($conf->{pending} || {}, $ds)
|| PVE::QemuConfig->has_cloudinit($res, $ds)
) {
die "$ds - cloud-init drive is already attached at '$ci_key'\n";
}
my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
my $name = "vm-$vmid-cloudinit";
@ -424,6 +433,16 @@ my $create_disks = sub {
my ($vtype) = PVE::Storage::parse_volname($storecfg, $volid);
die "cannot use volume $volid - content type needs to be 'images' or 'iso'"
if $vtype ne 'images' && $vtype ne 'iso';
if (PVE::QemuServer::Drive::drive_is_cloudinit($disk)) {
if (
my $ci_key = PVE::QemuConfig->has_cloudinit($conf, $ds)
|| PVE::QemuConfig->has_cloudinit($conf->{pending} || {}, $ds)
|| PVE::QemuConfig->has_cloudinit($res, $ds)
) {
die "$ds - cloud-init drive is already attached at '$ci_key'\n";
}
}
}
PVE::Storage::activate_volumes($storecfg, [ $volid ]) if $storeid;

15
PVE/QemuConfig.pm
View File

@ -521,4 +521,19 @@ sub __snapshot_rollback_get_unused {
# END implemented abstract methods from PVE::AbstractConfig
sub has_cloudinit {
my ($class, $conf, $skip) = @_;
my $found;
$class->foreach_volume($conf, sub {
my ($key, $volume) = @_;
return if ($skip && $skip eq $key) || $found;
$found = $key if PVE::QemuServer::Drive::drive_is_cloudinit($volume);
});
return $found;
}
1;