From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 6822169DD9
for <pve-devel@lists.proxmox.com>; Wed, 24 Mar 2021 06:58:07 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 6216E35629
for <pve-devel@lists.proxmox.com>; Wed, 24 Mar 2021 06:58:07 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(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 09B3A3560C
for <pve-devel@lists.proxmox.com>; Wed, 24 Mar 2021 06:58:06 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C1E5344776;
Wed, 24 Mar 2021 06:58:05 +0100 (CET)
Message-ID: <7f406812-b102-37ea-d967-1d43d4a759cf@proxmox.com>
Date: Wed, 24 Mar 2021 06:58:04 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:87.0) Gecko/20100101
Thunderbird/87.0
Content-Language: en-US
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Alexandre Derumier <aderumier@odiso.com>
References: <20210319120656.86740-1-aderumier@odiso.com>
<20210319120656.86740-2-aderumier@odiso.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
In-Reply-To: <20210319120656.86740-2-aderumier@odiso.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.045 Adjusted score from AWL reputation of From: address
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)
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches 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, cloudinit.pm]
Subject: Re: [pve-devel] [PATCH qemu-server 1/4] cloudinit: add cloudinit
section for current generated config.
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>
X-List-Received-Date: Wed, 24 Mar 2021 05:58:07 -0000
On 19.03.21 13:06, Alexandre Derumier wrote:
> Instead using vm pending options for pending cloudinit generated config,
>
> write current generated cloudinit config in a new [CLOUDINIT] SECTION.
But that collides with snapshots? E.g., if I make one named CLOUDINIT I get
also a [CLOUDINIT] section in the config?
If we go that way you may want to use a unique identifier, [special:cloudinit]
or the like (colons are not allowed for snapshot names, IIRC).
>
> Currently, some options like vm name, nic mac address can be hotplugged,
> so they are not way to know if the cloud-init disk is already updated.
> ---
> PVE/QemuServer.pm | 22 +++++++++++++++++-----
> PVE/QemuServer/Cloudinit.pm | 32 ++++++++++++++++++++++++++++++++
> 2 files changed, 49 insertions(+), 5 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 57cfe62..f47ae87 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -2135,6 +2135,7 @@ sub parse_vm_config {
> digest => Digest::SHA::sha1_hex($raw),
> snapshots => {},
> pending => {},
> + cloudinit => {},
> };
>
> $filename =~ m|/qemu-server/(\d+)\.conf$|
> @@ -2159,6 +2160,11 @@ sub parse_vm_config {
> $descr = undef;
> $conf = $res->{$section} = {};
> next;
> + } elsif ($line =~ m/^\[CLOUDINIT\]\s*$/i) {
> + $section = 'cloudinit';
> + $descr = undef;
> + $conf = $res->{$section} = {};
> + next;
>
> } elsif ($line =~ m/^\[([a-z][a-z0-9_\-]+)\]\s*$/i) {
> $section = $1;
> @@ -2219,7 +2225,6 @@ sub parse_vm_config {
> warn "vm $vmid - unable to parse config: $line\n";
> }
> }
> -
> if (defined($descr)) {
> $descr =~ s/\s+$//;
> $conf->{description} = $descr;
> @@ -2256,7 +2261,7 @@ sub write_vm_config {
>
> foreach my $key (keys %$cref) {
> next if $key eq 'digest' || $key eq 'description' || $key eq 'snapshots' ||
> - $key eq 'snapstate' || $key eq 'pending';
> + $key eq 'snapstate' || $key eq 'pending' || $key eq 'cloudinit';
> my $value = $cref->{$key};
> if ($key eq 'delete') {
> die "propertry 'delete' is only allowed in [PENDING]\n"
> @@ -2280,8 +2285,10 @@ sub write_vm_config {
>
> &$cleanup_config($conf->{pending}, 1);
>
> + &$cleanup_config($conf->{cloudinit}, 1);
> +
> foreach my $snapname (keys %{$conf->{snapshots}}) {
> - die "internal error: snapshot name '$snapname' is forbidden" if lc($snapname) eq 'pending';
> + die "internal error: snapshot name '$snapname' is forbidden" if lc($snapname) =~ m/^(pending|cloudinit)$/;
> &$cleanup_config($conf->{snapshots}->{$snapname}, undef, $snapname);
> }
>
> @@ -2310,7 +2317,7 @@ sub write_vm_config {
> }
>
> foreach my $key (sort keys %$conf) {
> - next if $key =~ /^(digest|description|pending|snapshots)$/;
> + next if $key =~ /^(digest|description|pending|cloudinit|snapshots)$/;
> $raw .= "$key: $conf->{$key}\n";
> }
> return $raw;
> @@ -2323,6 +2330,11 @@ sub write_vm_config {
> $raw .= &$generate_raw_config($conf->{pending}, 1);
> }
>
> + if (scalar(keys %{$conf->{cloudinit}})){
> + $raw .= "\n[CLOUDINIT]\n";
> + $raw .= &$generate_raw_config($conf->{cloudinit}, 1);
> + }
> +
> foreach my $snapname (sort keys %{$conf->{snapshots}}) {
> $raw .= "\n[$snapname]\n";
> $raw .= &$generate_raw_config($conf->{snapshots}->{$snapname});
> @@ -4702,9 +4714,9 @@ sub vmconfig_apply_pending {
> $conf->{$opt} = delete $conf->{pending}->{$opt};
> }
> }
> -
> # write all changes at once to avoid unnecessary i/o
> PVE::QemuConfig->write_config($vmid, $conf);
> +
> }
>
> sub vmconfig_update_net {
> diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
> index c464bf3..f4bf925 100644
> --- a/PVE/QemuServer/Cloudinit.pm
> +++ b/PVE/QemuServer/Cloudinit.pm
> @@ -570,6 +570,38 @@ sub generate_cloudinitconfig {
>
> $generator->($conf, $vmid, $drive, $volname, $storeid);
> });
> +
> + my $cloudinitconf = delete $conf->{cloudinit};
> + $cloudinitconf = {};
> +
> + my @cloudinit_opts = keys %{PVE::QemuServer::cloudinit_config_properties()};
> + push @cloudinit_opts, 'name';
> +
> + foreach my $opt (@cloudinit_opts) {
> +
> + if ($opt =~ m/^ipconfig(\d+)/) {
> + my $netid = "net$1";
> + next if !defined($conf->{$netid});
> + $conf->{cloudinit}->{$netid} = $conf->{$netid};
> + }
> +
> + $conf->{cloudinit}->{$opt} = $conf->{$opt} if $conf->{$opt};
> + }
> +
> + $conf->{cloudinit}->{name} = "VM$vmid" if !$conf->{cloudinit}->{name};
> +
> + foreach my $opt (keys %{$conf}) {
> + if (PVE::QemuServer::is_valid_drivename($opt)) {
> + my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
> + if (PVE::QemuServer::drive_is_cloudinit($drive)) {
> + $conf->{cloudinit}->{$opt} = $conf->{$opt};
> +
> + }
> + }
> + }
> +
> + PVE::QemuConfig->write_config($vmid, $conf);
> +
> }
>
> sub dump_cloudinit_config {
>