From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, aderumier@odiso.com
Subject: Re: [pve-devel] [PATCH v3 qemu-server 5/7] cloudinit : add extract_cloudinit_config
Date: Thu, 31 Mar 2022 15:01:32 +0200 [thread overview]
Message-ID: <8c59eac3-86b4-5e89-1e7c-9fb493d4b2da@proxmox.com> (raw)
In-Reply-To: <20210609115417.3326775-6-aderumier@odiso.com>
Am 09.06.21 um 13:54 schrieb Alexandre Derumier:
> --- a/PVE/QemuServer/Cloudinit.pm
> +++ b/PVE/QemuServer/Cloudinit.pm
> @@ -607,11 +607,56 @@ sub dump_cloudinit_config {
> }
> }
>
> +sub extract_cloudinit_config {
> + my ($conf, $vmid) = @_;
> +
> + my $current_drive = undef;
> + PVE::QemuConfig->foreach_volume($conf, sub {
> + my ($ds, $drive) = @_;
> + $current_drive = $drive if PVE::QemuServer::drive_is_cloudinit($drive);
> +
Style nit: blank line shouldn't be there
> + });
> +
Style nit: above line starts with a space
> + my $running = PVE::QemuServer::check_running($vmid);
> + my $storecfg = PVE::Storage::config();
> + my $iso_path = PVE::Storage::path($storecfg, $current_drive->{file});
> + my ($storeid, $volname) = PVE::Storage::parse_volume_id($current_drive->{file}, 1);
> + my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
> + my $format = PVE::QemuServer::qemu_img_format($scfg, $volname);
> + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
> + $plugin->activate_volume($storeid, $scfg, $volname) if !$running;
Please use the abstraction the storage module provides, i.e.
PVE::Storage::activate_volumes().
> +
> + my $raw_cloudinit_config = undef;
> +
> + my $path = "/run/pve/cloudinit_current/$vmid";
> + mkpath $path;
> + my $parser = sub {
> + my $line = shift;
> + $raw_cloudinit_config .= "$line\n";
> + };
> + eval {
> + #qemu-img dd is really slower (5s) than convert (0.2s)
> + run_command([
> + ['qemu-img', 'convert', '-f', 'raw', '-O', 'raw', "$iso_path", "$path/iso"]
Should use $format (or it won't work for qcow2).
No need for the second surrounding [].
> + ]);
> +
> + run_command([
Also shouldn't need the second [] I think.
> + ['isoinfo', '-i', "$path/iso", '-x', "/PROXMOX/VMCONF.\;1"]
> + ], outfunc => $parser);
> + };
> + rmtree($path);
> + $plugin->deactivate_volume($storeid, $scfg, $volname) if !$running;
PVE::Storage::deactivate_volumes().
> +
> + my $cloudinit_config = PVE::QemuServer::parse_vm_config("/qemu-server/$vmid.conf", $raw_cloudinit_config);
> + return $cloudinit_config;
Style nit: no need to introduce that variable
> +}
> +
next prev parent reply other threads:[~2022-03-31 13:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 11:54 [pve-devel] [PATCH v3 qemu-server 0/7] cloudinit pending behaviour change Alexandre Derumier
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 1/7] cloudinit: add vm config to cloudinit drive Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 2/7] cloudinit: generate cloudinit drive on offline plug Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 3/7] cloudinit: make cloudnit options fastplug Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 4/7] api2: add cloudinit config api Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2022-04-27 14:14 ` DERUMIER, Alexandre
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 5/7] cloudinit : add extract_cloudinit_config Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner [this message]
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 6/7] api2: add cloudinit_update Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 7/7] add cloudinit hotplug Alexandre Derumier
2022-03-31 13:01 ` [pve-devel] [PATCH v3 qemu-server 0/7] cloudinit pending behaviour change Fabian Ebner
2022-03-31 13:11 ` DERUMIER, Alexandre
2022-04-20 16:22 ` DERUMIER, Alexandre
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=8c59eac3-86b4-5e89-1e7c-9fb493d4b2da@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=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