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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A3DC56AC19 for ; Sat, 6 Mar 2021 05:10:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9433C2BDC8 for ; Sat, 6 Mar 2021 05:10:05 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id B537A2BDBD for ; Sat, 6 Mar 2021 05:10:02 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 8255D218C36; Sat, 6 Mar 2021 05:09:55 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Sat, 6 Mar 2021 05:09:42 +0100 Message-Id: <20210306040942.1808743-1-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.137 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.323 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 qemu-server] add clouinit hotplug feature 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: Sat, 06 Mar 2021 04:10:05 -0000 This add a new cloudinit hotplug feature, to auto-regenerate the cloudinit drive when cloudinit options are changed. Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0ac4fcf..1394545 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"; @@ -4438,6 +4438,27 @@ sub vmconfig_hotplug_pending { my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); + if($hotplug_features->{cloudinit}) { + + my $regenerate_cloudinit = undef; + foreach my $opt (keys %{$selection}) { + $regenerate_cloudinit = 1 if $opt =~ m/^(hostname|net(\d+)|ipconfig(\d+)|searchdomain|nameserver|sshkeys|citype|ciuser|cipassword|cicustom)/; + } + + if ($regenerate_cloudinit) { + + PVE::QemuConfig->foreach_volume($conf, sub { + my ($ds, $drive) = @_; + if (drive_is_cloudinit($drive)) { + + $conf->{pending}->{delete}->{$ds} = 1; + $conf->{pending}->{$ds} = print_drive($drive); + $selection->{$ds} = 1; + } + }); + } + } + my $cgroup = PVE::QemuServer::CGroup->new($vmid); my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete}); foreach my $opt (sort keys %$pending_delete_hash) { -- 2.20.1