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

adding code to consider gce provider when api does vm_ready? check

Browse source
This commit is contained in:
Samuel Beaulieu 2021-12-30 10:29:06 -06:00
parent acf84267e2
commit ce43a9316c
No known key found for this signature in database
GPG key ID: 12030F74136D0F34
2 changed files with 72 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,23 @@ module Vmpooler
Vmpooler::API.settings.config[:pool_names].include?(template)
end
def provider_exists?(provider_name)
return false if Vmpooler::API.settings.config[:providers].nil?
return true if Vmpooler::API.settings.config[:providers]&.key?(provider_name)
Vmpooler::API.settings.config[:providers].each_key { |k| return true if Vmpooler::API.settings.config[:providers][k]['provider_class'] == provider_name }
false
end
def provider_config(provider_name, pool_name)
return Vmpooler::API.settings.config[:providers][provider_name] if Vmpooler::API.settings.config[:providers][provider_name]
pools.each do |pool|
if pool['name'] == pool_name
return Vmpooler::API.settings.config[:providers][pool['provider']] if Vmpooler::API.settings.config[:providers][pool['provider']]
end
end
return nil
end
def need_auth!
validate_auth(backend)
end
@ -150,7 +167,13 @@ module Vmpooler
next if vms.empty?
vms.reverse.each do |vm|
ready = vm_ready?(vm, config['domain'])
# do one last check that the VM is reachable before handing it over. Unfortunately the provider context does
# not exist here, so it needs to infer the domain here
if provider_exists?('gce')
domain = provider_config('gce', template_backend)['dns_zone'] if provider_config('gce', template_backend) && provider_config('gce', template_backend)['dns_zone']
end
ready = vm_ready?(vm, domain || config['domain'])
if ready
smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
if smoved