proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-23 19:05:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cloud-init: make parameter order consistent

Browse Source 
we have '$conf, $vmid' elsewhere for cloudinit, this was the only
function which had them in reverse

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2018-03-12 16:25:06 +01:00 committed by Wolfgang Bumiller
parent 8de34458ea
commit 4a85391549
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/QemuServer/Cloudinit.pm
View File

@ -12,7 +12,7 @@ use PVE::Storage;
use PVE::QemuServer;
sub commit_cloudinit_disk {
my ($vmid, $conf, $drive, $volname, $storeid, $files, $label) = @_;
my ($conf, $vmid, $drive, $volname, $storeid, $files, $label) = @_;
my $path = "/run/pve/cloudinit/$vmid/";
mkpath $path;
@ -212,7 +212,7 @@ sub generate_configdrive2 {
'/openstack/content/0000' => $network_data,
'/openstack/latest/meta_data.json' => $meta_data
};
commit_cloudinit_disk($vmid, $conf, $drive, $volname, $storeid, $files, 'config-2');
commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'config-2');
}
sub nocloud_network_v2 {
@ -377,7 +377,7 @@ sub generate_nocloud {
'/network-config' => $network_data,
'/meta-data' => $meta_data
};
commit_cloudinit_disk($vmid, $conf, $drive, $volname, $storeid, $files, 'cidata');
commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'cidata');
}
my $cloudinit_methods = {