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 15C41718BF for ; Mon, 20 Jun 2022 12:45:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1019E29130 for ; Mon, 20 Jun 2022 12:45:12 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B7A5F290F1 for ; Mon, 20 Jun 2022 12:45:10 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 3BD37B49B; Mon, 20 Jun 2022 12:45:04 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 3179118D27D; Mon, 20 Jun 2022 12:45:04 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 20 Jun 2022 12:44:58 +0200 Message-Id: <20220620104502.1239272-6-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220620104502.1239272-1-aderumier@odiso.com> References: <20220620104502.1239272-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.119 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 v6 qemu-server 5/9] generate cloudinit drive on offline plug 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, 20 Jun 2022 10:45:12 -0000 Currently when only generate it at vm start Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 9f550d9..d3c9448 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5103,6 +5103,8 @@ sub vmconfig_apply_pending { PVE::QemuConfig->cleanup_pending($conf); + my $generate_cloudnit = undef; + foreach my $opt (keys %{$conf->{pending}}) { # add/change next if $opt eq 'delete'; # just to be sure eval { @@ -5110,15 +5112,24 @@ sub vmconfig_apply_pending { vmconfig_register_unused_drive($storecfg, $vmid, $conf, parse_drive($opt, $conf->{$opt})) } }; + if (my $err = $@) { $add_apply_error->($opt, $err); } else { + + if (is_valid_drivename($opt)) { + my $drive = parse_drive($opt, $conf->{pending}->{$opt}); + $generate_cloudnit = 1 if drive_is_cloudinit($drive); + } + $conf->{$opt} = delete $conf->{pending}->{$opt}; } } + # write all changes at once to avoid unnecessary i/o PVE::QemuConfig->write_config($vmid, $conf); + PVE::QemuServer::Cloudinit::generate_cloudinitconfig($conf, $vmid) if $generate_cloudnit; } sub vmconfig_update_net { -- 2.30.2