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 818C698747 for ; Thu, 11 May 2023 13:13:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6343020126 for ; Thu, 11 May 2023 13:13:15 +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 for ; Thu, 11 May 2023 13:13:14 +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 50DB341986 for ; Thu, 11 May 2023 13:13:14 +0200 (CEST) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Thu, 11 May 2023 13:12:47 +0200 Message-Id: <20230511111249.171748-4-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230511111249.171748-1-l.nunner@proxmox.com> References: <20230511111249.171748-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.129 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 - Subject: [pve-devel] [PATCH RFC container 3/3] cloudinit: add dump command to pct 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, 11 May 2023 11:13:45 -0000 Introduce a 'pct cloudinit dump
' command to dump the generated cloudinit configuration for a section. Signed-off-by: Leo Nunner --- src/PVE/API2/LXC.pm | 33 +++++++++++++++++++++++++++++++++ src/PVE/CLI/pct.pm | 4 ++++ src/PVE/LXC/Cloudinit.pm | 11 +++++++++++ 3 files changed, 48 insertions(+) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index e585509..2cae727 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -2963,4 +2963,37 @@ __PACKAGE__->register_method({ return { socket => $socket }; }}); + +__PACKAGE__->register_method({ + name => 'cloudinit_generated_config_dump', + path => '{vmid}/cloudinit/dump', + method => 'GET', + proxyto => 'node', + description => "Get automatically generated cloudinit config.", + permissions => { + check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]], + }, + parameters => { + additionalProperties => 0, + properties => { + node => get_standard_option('pve-node'), + vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }), + type => { + description => 'Config type.', + type => 'string', + enum => ['user', 'meta'], + }, + }, + }, + returns => { + type => 'string', + }, + code => sub { + my ($param) = @_; + + my $conf = PVE::LXC::Config->load_config($param->{vmid}); + + return PVE::LXC::Cloudinit::dump_cloudinit_config($conf, $param->{type}); + }}); + 1; diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm index ff75d33..69f3560 100755 --- a/src/PVE/CLI/pct.pm +++ b/src/PVE/CLI/pct.pm @@ -1000,6 +1000,10 @@ our $cmddef = { rescan => [ __PACKAGE__, 'rescan', []], cpusets => [ __PACKAGE__, 'cpusets', []], fstrim => [ __PACKAGE__, 'fstrim', ['vmid']], + + cloudinit => { + dump => [ "PVE::API2::LXC", 'cloudinit_generated_config_dump', ['vmid', 'type'], { node => $nodename }, sub { print "$_[0]\n"; }], + }, }; 1; diff --git a/src/PVE/LXC/Cloudinit.pm b/src/PVE/LXC/Cloudinit.pm index e4bc67d..c977a08 100644 --- a/src/PVE/LXC/Cloudinit.pm +++ b/src/PVE/LXC/Cloudinit.pm @@ -111,4 +111,15 @@ sub create_cloudinit_files { }); } +sub dump_cloudinit_config { + my ($conf, $type) = @_; + + if ($type eq 'user') { + return cloudinit_userdata($conf); + } else { # metadata config + my $user = cloudinit_userdata($conf); + return gen_cloudinit_metadata($user); + } +} + 1; -- 2.30.2