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> --- changes from v2: * adapt to load_profile name change PVE/API2/Qemu.pm | 23 +++++++++++++++++++++++ PVE/QemuServer.pm | 6 ++++++ 2 files changed, 29 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 38bdaabd..cce36a8d 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,19 @@ __PACKAGE__->register_method({ my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); + my $profile = extract_param($param, 'profile'); + if (defined($profile)) { + $rpcenv->check_full($authuser, "/mapping/guest-profile/${profile}", ['Mapping.Use']); + my $profile_cfg = eval { PVE::Profiles::Plugin::load_profile($profile, 'vm') }; + raise_param_exc({ profile => "$@"}) if $@; + + for my $opt (keys $param->%*) { + $profile_cfg->{$opt} = $param->{$opt}; + } + + $param = $profile_cfg; + } + my $node = extract_param($param, 'node'); my $vmid = extract_param($param, 'vmid'); @@ -1013,6 +1034,8 @@ __PACKAGE__->register_method({ my $conf = $param; my $arch = PVE::QemuServer::get_vm_arch($conf); + print "using profile '$profile'\n" if $profile; + $conf->{meta} = PVE::QemuServer::new_meta_info_string(); my $vollist = []; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index c465fb6f..1c7e65ea 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -293,6 +293,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