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 A09666D373 for ; Thu, 1 Apr 2021 02:21:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9361E15312 for ; Thu, 1 Apr 2021 02:21:42 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2250D15283 for ; Thu, 1 Apr 2021 02:21:40 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id D07AF76C66; 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:26 +0200 Message-Id: <20210401002127.4139144-6-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, qemu.pm, qm.pm] Subject: [pve-devel] [PATCH v2 qemu-server 5/6] 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, 01 Apr 2021 00:21:42 -0000 This allow to regenerate the config drive with 1 api call. This also avoid to delete drive first, and recreate it again. As it's a readonly drive, we can simply live update it, and eject/replace it with qemu monitor --- PVE/API2/Qemu.pm | 44 ++++++++++++++++++++++++++++++++++++++++++++ PVE/CLI/qm.pm | 3 ++- PVE/QemuServer.pm | 28 ++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index b6122fe..de2c378 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1112,6 +1112,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], + }, + 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); + + }; + + PVE::QemuConfig->lock_config($vmid, $updatefn); + + return; + }}); + # POST/PUT {vmid}/config implementation # # The original API used PUT (idempotent) an we assumed that all operations diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index e24b832..8d594c6 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -996,7 +996,8 @@ our $cmddef = { my $data = shift; print "$data\n"; }], - pending => [ "PVE::API2::Qemu", 'cloudinit_pending', ['vmid'], { node => $nodename }, \&PVE::GuestHelpers::format_pending ] + pending => [ "PVE::API2::Qemu", 'cloudinit_pending', ['vmid'], { node => $nodename }, \&PVE::GuestHelpers::format_pending ], + update => [ "PVE::API2::Qemu", 'cloudinit_update', ['vmid'], { node => $nodename }], }, }; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 900e227..59f90c9 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4867,6 +4867,34 @@ sub vmconfig_update_disk { vm_deviceplug($storecfg, $conf, $vmid, $opt, $drive, $arch, $machine_type); } +sub vmconfig_update_cloudinit_drive { + my ($storecfg, $conf, $vmid) = @_; + + my $cloudinit_ds = undef; + my $cloudinit_drive = undef; + + PVE::QemuConfig->foreach_volume($conf, sub { + my ($ds, $drive) = @_; + if (PVE::QemuServer::drive_is_cloudinit($drive)) { + $cloudinit_ds = $ds; + $cloudinit_drive = $drive; + } + }); + + return if !$cloudinit_drive; + + PVE::QemuServer::Cloudinit::generate_cloudinitconfig($conf, $vmid); + my $running = PVE::QemuServer::check_running($vmid); + + if ($running) { + my $path = PVE::Storage::path($storecfg, $cloudinit_drive->{file}); + if ($path) { + mon_cmd($vmid, "eject", force => JSON::true, id => "$cloudinit_ds"); + mon_cmd($vmid, "blockdev-change-medium", id => "$cloudinit_ds", filename => "$path"); + } + } +} + # called in locked context by incoming migration sub vm_migrate_get_nbd_disks { my ($storecfg, $conf, $replicated_volumes) = @_; -- 2.20.1