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

fix rubocop and fetch_single_vm logic, bump version

Browse source
This commit is contained in:
Samuel Beaulieu 2022-03-30 08:42:24 -05:00
parent 2e608b7196
commit 3809dac2d4
No known key found for this signature in database
GPG key ID: 12030F74136D0F34
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/vmpooler/api/v2.rb
View file

@ -71,15 +71,10 @@ module Vmpooler
template_backends.each do |template_backend| template_backends.each do |template_backend|
vms = backend.smembers("vmpooler__ready__#{template_backend}") vms = backend.smembers("vmpooler__ready__#{template_backend}")
next if vms.empty? next if vms.empty?
vm = vms.pop
vms.reverse.each do |vm| smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm) if smoved
if smoved return [vm, template_backend, template]
return [vm, template_backend, template]
else
metrics.increment("checkout.smove.failed.#{template_backend}")
return [nil, nil, nil]
end
end end
end end
[nil, nil, nil] [nil, nil, nil]
@ -365,7 +360,7 @@ module Vmpooler
Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count| Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count|
instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}") instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
domain = Parsing.get_domain_for_pool(full_config, pool) domain = Parsing.get_domain_for_pool(full_config, pool)
instances.map!{ |instance| instance.concat(".#{domain}") } if domain instances.map! { |instance| instance.concat(".#{domain}") } if domain
if result.key?(platform_alias) if result.key?(platform_alias)
result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances

2
lib/vmpooler/version.rb
View file

@ -1,5 +1,5 @@
# frozen_string_literal: true # frozen_string_literal: true
module Vmpooler module Vmpooler
VERSION = '2.2.0' VERSION = '2.3.0'
end end