From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v4 qemu-server 2/6] generate cloudinit drive on offline plug
Date: Wed, 27 Apr 2022 16:05:32 +0200 [thread overview]
Message-ID: <20220427140536.1606918-3-aderumier@odiso.com> (raw)
In-Reply-To: <20220427140536.1606918-1-aderumier@odiso.com>
Currently when only generate it at vm start
---
PVE/QemuServer.pm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 8aa550b..53be830 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5088,6 +5088,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 {
@@ -5095,15 +5097,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-04-27 14:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-27 14:05 [pve-devel] [PATCH v4 qemu-server 0/6] cloudinit pending behaviour change Alexandre Derumier
2022-04-27 14:05 ` [pve-devel] [PATCH v4 qemu-server 1/6] cloudinit: add cloudinit section for current generated config Alexandre Derumier
2022-05-06 10:20 ` Fabian Ebner
2022-05-09 15:50 ` DERUMIER, Alexandre
2022-05-16 12:00 ` DERUMIER, Alexandre
2022-05-16 13:24 ` DERUMIER, Alexandre
2022-04-27 14:05 ` Alexandre Derumier [this message]
2022-04-27 14:05 ` [pve-devel] [PATCH v4 qemu-server 3/6] cloudinit: make cloudnit options fastplug Alexandre Derumier
2022-05-06 10:20 ` Fabian Ebner
2022-04-27 14:05 ` [pve-devel] [PATCH v4 qemu-server 4/6] api2: add cloudinit config api Alexandre Derumier
2022-04-27 14:05 ` [pve-devel] [PATCH v4 qemu-server 5/6] api2: add cloudinit_update Alexandre Derumier
2022-04-27 14:05 ` [pve-devel] [PATCH v4 qemu-server 6/6] add cloudinit hotplug Alexandre Derumier
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=20220427140536.1606918-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