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 1ABAD70BD7 for ; Mon, 16 May 2022 18:08:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 152441F9CD for ; Mon, 16 May 2022 18:07:32 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (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 EF7031F92F for ; Mon, 16 May 2022 18:07:27 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 42A12159C9; Mon, 16 May 2022 18:07:21 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 34EDA14DB93; Mon, 16 May 2022 18:07:21 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 16 May 2022 18:07:16 +0200 Message-Id: <20220516160719.3818057-7-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220516160719.3818057-1-aderumier@odiso.com> References: <20220516160719.3818057-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.103 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 qemu-server 6/9] add cloudinit hotplug 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: Mon, 16 May 2022 16:08:30 -0000 This allow to regenerate config drive if pending values exist when we change vm options. Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a38ae3e..babc86f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -303,7 +303,7 @@ my $confdesc = { optional => 1, type => 'string', format => 'pve-hotplug-features', description => "Selectively enable hotplug features. This is a comma separated list of" - ." hotplug features: 'network', 'disk', 'cpu', 'memory' and 'usb'. Use '0' to disable" + ." hotplug features: 'network', 'disk', 'cpu', 'memory', 'usb' and 'cloudinit'. Use '0' to disable" ." hotplug completely. Using '1' as value is an alias for the default `network,disk,usb`.", default => 'network,disk,usb', }, @@ -1356,7 +1356,7 @@ sub parse_hotplug_features { $data = $confdesc->{hotplug}->{default} if $data eq '1'; foreach my $feature (PVE::Tools::split_list($data)) { - if ($feature =~ m/^(network|disk|cpu|memory|usb)$/) { + if ($feature =~ m/^(network|disk|cpu|memory|usb|cloudinit)$/) { $res->{$1} = 1; } else { die "invalid hotplug feature '$feature'\n"; @@ -5003,8 +5003,16 @@ sub vmconfig_hotplug_pending { delete $conf->{pending}->{$opt}; } } - PVE::QemuConfig->write_config($vmid, $conf); + + if($hotplug_features->{cloudinit}) { + my $pending = PVE::QemuServer::Cloudinit::get_pending_config($conf, $vmid); + my $regenerate = undef; + for my $item (@$pending) { + $regenerate = 1 if defined($item->{delete}) or defined($item->{pending}); + } + PVE::QemuServer::vmconfig_update_cloudinit_drive($storecfg, $conf, $vmid) if $regenerate; + } } sub try_deallocate_drive { -- 2.30.2