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 255C56D376 for ; Thu, 1 Apr 2021 02:21:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2357B15319 for ; Thu, 1 Apr 2021 02:21:43 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2216A15282 for ; Thu, 1 Apr 2021 02:21:40 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id D684276CD3; Thu, 1 Apr 2021 02:21:30 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 1 Apr 2021 02:21:27 +0200 Message-Id: <20210401002127.4139144-7-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401002127.4139144-1-aderumier@odiso.com> References: <20210401002127.4139144-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.167 Adjusted score from AWL reputation of From: address 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 KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH v2 qemu-server 6/6] 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: Thu, 01 Apr 2021 00:21:43 -0000 This allow to regenerate config drive if pending values exist when we change vm options. --- PVE/QemuServer.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 59f90c9..eaad21a 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -287,7 +287,7 @@ my $confdesc = { hotplug => { 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 completely. Value '1' is an alias for the default 'network,disk,usb'.", + description => "Selectively enable hotplug features. This is a comma separated list of hotplug features: 'network', 'disk', 'cpu', 'memory', 'usb' and 'cloudinit'. Use '0' to disable hotplug completely. Value '1' is an alias for the default 'network,disk,usb'.", default => 'network,disk,usb', }, reboot => { @@ -1298,7 +1298,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"; @@ -4601,8 +4601,17 @@ 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; + foreach my $opt (keys %{$pending}) { + my $item = $pending->{$opt}; + $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.20.1