proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-06 04:16:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cloud-init: sshkeys are now files on the CLI

Browse Source 
This requires a pve-common patch since we need to not only
load the file but also url-encode it.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-02-28 12:41:46 +01:00
parent 9ed7a77c6e
commit 3351aacc70
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/CLI/qm.pm
View File

@ -10,6 +10,7 @@ use Fcntl ':flock';
use File::Path; use File::Path;
use IO::Socket::UNIX; use IO::Socket::UNIX;
use IO::Select; use IO::Select;
use URI::Escape;
use PVE::Tools qw(extract_param); use PVE::Tools qw(extract_param);
use PVE::Cluster; use PVE::Cluster;
@ -663,6 +664,20 @@ my $print_agent_result = sub {
print to_json($result, { pretty => 1, canonical => 1}); print to_json($result, { pretty => 1, canonical => 1});
}; };
sub param_mapping {
my ($name) = @_;
my $ssh_key_map = ['sshkeys', sub {
return URI::Escape::uri_escape(PVE::Tools::file_get_contents($_[0]));
}];
my $mapping = {
'update_vm' => [$ssh_key_map],
'create_vm' => [$ssh_key_map],
};
return $mapping->{$name};
}
our $cmddef = { our $cmddef = {
list => [ "PVE::API2::Qemu", 'vmlist', [], list => [ "PVE::API2::Qemu", 'vmlist', [],
{ node => $nodename }, sub { { node => $nodename }, sub {