Am 10.02.25 um 13:07 schrieb Daniel Herzig:
> From: Leo Nunner <l.nun...@proxmox.com>
>
> Introduce configuration parameters for cloud-init. Like with VMs, it's
> possible to specify:
> - user
> - password
> - ssh keys
> - enable/disable updates on first boot
>
> It's also possible to pass through custom config files for the user and
> vendor settings. We don't allow configuring the network through
> cloud-init, since it will clash with whatever configuration we already
> did for the container.
Unfortunately, Leo didn't write why configuring 'meta' for cicustom is
not allowed...
> 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',
> + },
...i.e. it's missing here. This might be an oversight, because the doc
patch mentions it in an example command: 'pct set 9000 --cicustom
"user=<volume>,meta=<volume>"'
> +};
> +PVE::JSONSchema::register_format('pve-pct-cicustom', $cicustom_fmt);
> +
> +my $confdesc_cloudinit = {
> + cienable => {
> + optional => 1,
> + type => 'boolean',
> + description => "cloud-init: provide cloud-init configuration to
> container.",
Missing the default.
> + },
> + ciuser => {
> + optional => 1,
> + type => 'string',
> + description => "cloud-init: User name to change ssh keys and password
> for instead of the"
> + ." image's configured default user.",
> + },
> + cipassword => {
> + optional => 1,
> + type => 'string',
> + description => 'cloud-init: Password to assign the user. Using this is
> generally not'
> + .' recommended. Use ssh keys instead. Also note that older
> cloud-init versions do not'
> + .' support hashed passwords.',
> + },
> + ciupgrade => {
> + optional => 1,
> + type => 'boolean',
> + description => 'cloud-init: do an automatic package update on boot.'
Missing the default.
> + },
> + cicustom => {
> + optional => 1,
> + type => 'string',
> + description => 'cloud-init: Specify custom files to replace the
> automatically generated'
> + .' ones at start.',
> + format => 'pve-pct-cicustom',
> + },
> + sshkeys => {
> + optional => 1,
> + type => 'string',
> + format => 'urlencoded',
> + description => "cloud-init: Setup public SSH keys (one key per line,
> OpenSSH format).",
> + },
> +};
> +
> my $confdesc = {
> lock => {
> optional => 1,
> @@ -622,6 +679,10 @@ my $confdesc = {
> },
> };
>
> +foreach my $key (keys %$confdesc_cloudinit) {
Style nit: use "for"
> + $confdesc->{$key} = $confdesc_cloudinit->{$key};
> +}
> +
> 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
