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 9D8E070B24 for ; Mon, 16 May 2022 18:08:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 94DA71F978 for ; Mon, 16 May 2022 18:07:30 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CF4A51F920 for ; Mon, 16 May 2022 18:07:27 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 37DFB7FB1; Mon, 16 May 2022 18:07:21 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 1C15F14DC0D; Mon, 16 May 2022 18:07:21 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 16 May 2022 18:07:11 +0200 Message-Id: <20220516160719.3818057-2-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220516160719.3818057-1-aderumier@odiso.com> References: <20220516160719.3818057-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.108 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 NO_DNS_FOR_FROM 0.001 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 qemu-server 1/9] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2022 16:08:00 -0000 Instead using vm pending options for pending cloudinit generated config, write current generated cloudinit config in a new [special:cloudinit] SECTION. 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. Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 20 +++++++++++++++++--- PVE/QemuServer/Cloudinit.pm | 31 +++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index e9aa248..b282cfd 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2003,6 +2003,7 @@ sub vmconfig_register_unused_drive { if (drive_is_cloudinit($drive)) { eval { PVE::Storage::vdisk_free($storecfg, $drive->{file}) }; warn $@ if $@; + delete $conf->{cloudinit}; } elsif (!drive_is_cdrom($drive)) { my $volid = $drive->{file}; if (vm_is_volid_owner($storecfg, $vmid, $volid)) { @@ -2373,6 +2374,7 @@ sub parse_vm_config { digest => Digest::SHA::sha1_hex($raw), snapshots => {}, pending => {}, + cloudinit => {}, }; my $handle_error = sub { @@ -2407,6 +2409,11 @@ sub parse_vm_config { $descr = undef; $conf = $res->{$section} = {}; next; + } elsif ($line =~ m/^\[special:cloudinit\]\s*$/i) { + $section = 'cloudinit'; + $descr = undef; + $conf = $res->{$section} = {}; + next; } elsif ($line =~ m/^\[([a-z][a-z0-9_\-]+)\]\s*$/i) { $section = $1; @@ -2504,7 +2511,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" @@ -2528,6 +2535,8 @@ 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'; &$cleanup_config($conf->{snapshots}->{$snapname}, undef, $snapname); @@ -2558,7 +2567,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; @@ -2571,6 +2580,11 @@ sub write_vm_config { $raw .= &$generate_raw_config($conf->{pending}, 1); } + if (scalar(keys %{$conf->{cloudinit}})){ + $raw .= "\n[special: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}); @@ -5102,9 +5116,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 b7daa2a..cdaf4e5 100644 --- a/PVE/QemuServer/Cloudinit.pm +++ b/PVE/QemuServer/Cloudinit.pm @@ -574,6 +574,37 @@ 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'; + + for 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}; + + for 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 { -- 2.30.2