From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v5 qemu-server 2/9] generate cloudinit drive on offline plug
Date: Mon, 16 May 2022 18:07:12 +0200 [thread overview]
Message-ID: <20220516160719.3818057-3-aderumier@odiso.com> (raw)
In-Reply-To: <20220516160719.3818057-1-aderumier@odiso.com>
Currently when only generate it at vm start
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/QemuServer.pm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index b282cfd..ac30769 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5103,6 +5103,8 @@ sub vmconfig_apply_pending {
PVE::QemuConfig->cleanup_pending($conf);
+ my $generate_cloudnit = undef;
+
foreach my $opt (keys %{$conf->{pending}}) { # add/change
next if $opt eq 'delete'; # just to be sure
eval {
@@ -5110,15 +5112,24 @@ sub vmconfig_apply_pending {
vmconfig_register_unused_drive($storecfg, $vmid, $conf, parse_drive($opt, $conf->{$opt}))
}
};
+
if (my $err = $@) {
$add_apply_error->($opt, $err);
} else {
+
+ if (is_valid_drivename($opt)) {
+ my $drive = parse_drive($opt, $conf->{pending}->{$opt});
+ $generate_cloudnit = 1 if drive_is_cloudinit($drive);
+ }
+
$conf->{$opt} = delete $conf->{pending}->{$opt};
}
}
+
# write all changes at once to avoid unnecessary i/o
PVE::QemuConfig->write_config($vmid, $conf);
+ PVE::QemuServer::Cloudinit::generate_cloudinitconfig($conf, $vmid) if $generate_cloudnit;
}
sub vmconfig_update_net {
--
2.30.2
next prev parent reply other threads:[~2022-05-16 16:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 16:07 [pve-devel] [PATCH v5 qemu-server 0/9] cloudinit pending behaviour change Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 1/9] cloudinit: add cloudinit section for current generated config Alexandre Derumier
2022-05-16 16:07 ` Alexandre Derumier [this message]
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 3/9] cloudinit: make cloudnit options fastplug Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 4/9] api2: add cloudinit config api Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 5/9] api2: add cloudinit_update Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 6/9] add cloudinit hotplug Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 7/9] api2: qemu : don't display cloudinit value Alexandre Derumier
2022-06-08 10:13 ` Fabian Ebner
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 8/9] vzdump : skip special:cloudinit section Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 9/9] migration: test targetnode min version for cloudinit section Alexandre Derumier
2022-06-08 10:14 ` Fabian Ebner
2022-06-08 10:14 ` [pve-devel] [PATCH v5 qemu-server 0/9] cloudinit pending behaviour change Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220516160719.3818057-3-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox