puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(POOLER-131) Return requested name when getting VMs

Browse source 
This commit updates fetch_single_vm to return the name of the template that was requested, instead of the name of the pool providing the VM to meet the request. Without this change, when an alias is used for fetching a VM, a different pool title may be returned containing the requested VMs than the user initially requested.
This commit is contained in:
kirby@puppetlabs.com 2018-09-27 12:04:01 -07:00
parent 918877918a
commit 4ba4a1dd6c
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/vmpooler/api/v1.rb
View file

@ -67,9 +67,9 @@ module Vmpooler
template_backends.each do |t|
vm = backend.spop('vmpooler__ready__' + t)
return [vm, t] if vm
return [vm, t, template] if vm
end
[nil, nil]
[nil, nil, nil]
end
def return_vm_to_ready_state(template, vm)
@ -113,27 +113,27 @@ module Vmpooler
payload.each do |requested, count|
count.to_i.times do |_i|
vm, name = fetch_single_vm(requested)
if !vm
vmname, vmpool, vmtemplate = fetch_single_vm(requested)
if !vmname
failed = true
metrics.increment('checkout.empty.' + requested)
break
else
vms << [ name, vm ]
metrics.increment('checkout.success.' + name)
vms << [ vmpool, vmname, vmtemplate ]
metrics.increment('checkout.success.' + vmtemplate)
end
end
end
if failed
vms.each do |(name, vm)|
return_vm_to_ready_state(name, vm)
vms.each do |(vmpool, vmname, vmtemplate)|
return_vm_to_ready_state(vmpool, vmname)
end
status 503
else
vms.each do |(name, vm)|
account_for_starting_vm(name, vm)
update_result_hosts(result, name, vm)
vms.each do |(vmpool, vmname, vmtemplate)|
account_for_starting_vm(vmpool, vmname)
update_result_hosts(result, vmtemplate, vmname)
end
result['ok'] = true