From 39b56b169ab7bb6414967627d6a1ad97817f1436 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Fri, 6 May 2022 12:11:14 +0200 Subject: [PATCH] api: create disks: avoid adding secondary cloud-init drives 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 --- PVE/API2/Qemu.pm | 19 +++++++++++++++++++ PVE/QemuConfig.pm | 15 +++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index d9ef201..3ec31c2 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -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; diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm index b75227b..482c7ab 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -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; -- 2.39.2