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 6248A94B4 for ; Thu, 31 Mar 2022 15:02:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 590191BDB2 for ; Thu, 31 Mar 2022 15:01:41 +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 C23E61BDA7 for ; Thu, 31 Mar 2022 15:01:40 +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 9461B42EF1; Thu, 31 Mar 2022 15:01:40 +0200 (CEST) Message-ID: Date: Thu, 31 Mar 2022 15:01:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, aderumier@odiso.com References: <20210609115417.3326775-1-aderumier@odiso.com> <20210609115417.3326775-7-aderumier@odiso.com> From: Fabian Ebner In-Reply-To: <20210609115417.3326775-7-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.113 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) 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 - 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, qemu.pm, qm.pm] Subject: Re: [pve-devel] [PATCH v3 qemu-server 6/7] api2: add cloudinit_update 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, 31 Mar 2022 13:02:11 -0000 Am 09.06.21 um 13:54 schrieb Alexandre Derumier: > This allow to regenerate the config drive with 1 api call. > > This also avoid to delete drive volume first, and recreate it again. > > we can simply: > - eject > - regenerated the volume > - replace it with qemu monitor > > Signed-off-by: Alexandre Derumier > --- > PVE/API2/Qemu.pm | 44 ++++++++++++++++++++++++++++++++++++++++++++ > PVE/CLI/qm.pm | 3 ++- > PVE/QemuServer.pm | 26 ++++++++++++++++++++++++++ > 3 files changed, 72 insertions(+), 1 deletion(-) > > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index 8ac3ae3..7843dcb 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -1131,6 +1131,50 @@ __PACKAGE__->register_method({ > return $res; > }}); > > +__PACKAGE__->register_method({ > + name => 'cloudinit_update', > + path => '{vmid}/cloudinit', > + method => 'PUT', > + protected => 1, > + proxyto => 'node', > + description => "Regenerate and change cloudinit config drive.", > + permissions => { > + check => ['perm', '/vms/{vmid}', 'VM.Config.Cloudinit', any => 1], Nit: no need for "any => 1" > + }, > + parameters => { > + additionalProperties => 0, > + properties => { > + node => get_standard_option('pve-node'), > + vmid => get_standard_option('pve-vmid'), > + }, > + }, > + returns => { type => 'null' }, > + code => sub { > + my ($param) = @_; > + > + my $rpcenv = PVE::RPCEnvironment::get(); > + > + my $authuser = $rpcenv->get_user(); > + > + my $vmid = extract_param($param, 'vmid'); > + > + my $updatefn = sub { > + > + my $conf = PVE::QemuConfig->load_config($vmid); > + > + PVE::QemuConfig->check_lock($conf); > + > + my $storecfg = PVE::Storage::config(); > + > + PVE::QemuServer::vmconfig_update_cloudinit_drive($storecfg, $conf, $vmid); Should be renamed if we go for the "config inside ISO"-approach, because it doesn't change the config itself now. > + Style nit: too many blanks > + }; > + > + PVE::QemuConfig->lock_config($vmid, $updatefn); > + > + return; > + }}); > + > # POST/PUT {vmid}/config implementation > # > # The original API used PUT (idempotent) an we assumed that all operations