we use the the profile cfg as the 'param' hash, but overwrite the values with the ones from the api call, so one can overwrite options from the profile easily
also we add the used profile to the meta info in the config, since it might be interesting which one was used Signed-off-by: Dominik Csapak <d.csa...@proxmox.com> --- PVE/API2/Qemu.pm | 27 ++++++++++++++++++++++++++- PVE/QemuServer.pm | 6 ++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 38bdaabd..ca18c796 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -49,6 +49,9 @@ use PVE::SSHInfo; use PVE::Replication; use PVE::StorageTunnel; +use PVE::Profiles::Plugin; +use PVE::Profiles::VM; + BEGIN { if (!$ENV{PVE_GENERATING_DOCS}) { require PVE::HA::Env::PVE2; @@ -837,6 +840,11 @@ __PACKAGE__->register_method({ default => 0, description => "Start VM after it was created successfully.", }, + profile => { + optional => 1, + type => 'string', + description => "The profile to use as base config.", + }, }, 1, # with_disk_alloc ), @@ -850,6 +858,23 @@ __PACKAGE__->register_method({ my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); + my $profile = extract_param($param, 'profile'); + my $meta_opts = {}; + if (defined($profile)) { + $rpcenv->check_full($authuser, "/mapping/profiles/${profile}", ['Mapping.Use']); + $meta_opts->{profile} = $profile; + my $profile_cfgs = cfs_read_file('virtual-guest/profiles.cfg'); + my $profile_cfg = $profile_cfgs->{ids}->{$profile}; + die "no such profile '$profile'\n" if !defined($profile_cfg); + die "wrong type '$profile_cfg->{type}'\n" if $profile_cfg->{type} ne 'vm'; + + for my $opt (keys $param->%*) { + $profile_cfg->{$opt} = $param->{$opt}; + } + delete $profile_cfg->{type}; + $param = $profile_cfg; + } + my $node = extract_param($param, 'node'); my $vmid = extract_param($param, 'vmid'); @@ -1013,7 +1038,7 @@ __PACKAGE__->register_method({ my $conf = $param; my $arch = PVE::QemuServer::get_vm_arch($conf); - $conf->{meta} = PVE::QemuServer::new_meta_info_string(); + $conf->{meta} = PVE::QemuServer::new_meta_info_string($meta_opts); my $vollist = []; eval { diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index c22b1544..490bad9d 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -290,6 +290,12 @@ my $meta_info_fmt = { pattern => '\d+(\.\d+)+', optional => 1, }, + 'profile' => { + type => 'string', + description => 'The Profile used during creation.', + format => 'pve-configid', + optional => 1, + }, }; my $confdesc = { -- 2.30.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel