From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
	by lore.proxmox.com (Postfix) with ESMTPS id 0C3041FF16F
	for <inbox@lore.proxmox.com>; Thu, 13 Feb 2025 13:15:44 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 8B9472FC6;
	Thu, 13 Feb 2025 13:15:40 +0100 (CET)
Message-ID: <2b2ac954-0bb9-4398-a292-383ed7667d76@proxmox.com>
Date: Thu, 13 Feb 2025 13:15:07 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
 Daniel Herzig <d.herzig@proxmox.com>
References: <20250210120722.163622-1-d.herzig@proxmox.com>
 <20250210120722.163622-2-d.herzig@proxmox.com>
Content-Language: en-US
From: Fiona Ebner <f.ebner@proxmox.com>
In-Reply-To: <20250210120722.163622-2-d.herzig@proxmox.com>
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.046 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
Subject: Re: [pve-devel] [PATCH 1/8 container] cloudinit: introduce config
 parameters
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

Am 10.02.25 um 13:07 schrieb Daniel Herzig:
> diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
> index 5cc37f7..e3ed93b 100644
> --- a/src/PVE/LXC/Config.pm
> +++ b/src/PVE/LXC/Config.pm
> @@ -450,6 +450,63 @@ my $features_desc = {
>      },
>  };
>  
> +my $cicustom_fmt = {
> +    user => {
> +	type => 'string',
> +	optional => 1,
> +	description => 'To pass a custom file containing all user data to the container via cloud-init.',
> +	format => 'pve-volume-id',
> +	format_description => 'volume',
> +    },
> +    vendor => {
> +	type => 'string',
> +	optional => 1,
> +	description => 'To pass a custom file containing all vendor data to the container via cloud-init.',
> +	format => 'pve-volume-id',
> +	format_description => 'volume',
> +    },
> +};
> +PVE::JSONSchema::register_format('pve-pct-cicustom', $cicustom_fmt);
> +
> +my $confdesc_cloudinit = {

Hmm, maybe we should rather move these into the Cloudinit module to
avoid bloating up the config module here. Then everything is collected
there.

>      },
>  };
>  
> +foreach my $key (keys %$confdesc_cloudinit) {
> +    $confdesc->{$key} = $confdesc_cloudinit->{$key};

And just access it here e.g. by declaring it as shared in the other module:

our $confdesc_cloudinit

> +}
> +
>  my $valid_lxc_conf_keys = {
>      'lxc.apparmor.profile' => 1,
>      'lxc.apparmor.allow_incomplete' => 1,



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel