From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B499C704A0 for ; Fri, 6 May 2022 12:11:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A706ABB2A for ; Fri, 6 May 2022 12:11:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 13C5EBB21 for ; Fri, 6 May 2022 12:11:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D4EC342F7D for ; Fri, 6 May 2022 12:11:17 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 6 May 2022 12:11:14 +0200 Message-Id: <20220506101114.45522-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.083 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [RFC qemu-server] api: create disks: avoid adding secondary cloud-init drives X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2022 10:11:48 -0000 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 --- Are there any scenarios where having multiple cloud-init drives is useful? 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 a8246574..74f0181c 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 cfef8d37..f7557613 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -518,4 +518,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.30.2