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

Refactor obtaining and saving ip address

Browse source
This commit is contained in:
Jake Spain 2023-02-17 09:01:42 -05:00
parent 130736fa9d
commit c0e59a0347
No known key found for this signature in database
GPG key ID: BC1C4DA0A085E113
1 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
lib/vmpooler/providers/vsphere.rb
View file

@ -387,32 +387,20 @@ module Vmpooler
spec: clone_spec spec: clone_spec
).wait_for_completion ).wait_for_completion
# Make optional?
ip = get_vm_ip_address(new_vm_object)
@redis.with_metrics do |redis|
redis.hset("vmpooler__vm__#{new_vmname}", 'ip', ip)
end
vm_hash = generate_vm_hash(new_vm_object, pool_name) vm_hash = generate_vm_hash(new_vm_object, pool_name)
end end
vm_hash vm_hash
end end
# The inner method requires vmware tools running in the guest os # The inner method requires vmware tools running in the guest os
def get_vm_ip_address(vm_object, maxloop = 0, loop_delay = 1, max_age = 60) def get_vm_ip_address(vm_name, pool_name)
loop_count = 1
ip = nil @connection_pool.with_metrics do |pool_object|
while ip.nil? connection = ensured_vsphere_connection(pool_object)
sleep(loop_delay) vm_object = find_vm(pool_name, vm_name, connection)
ip = vm_object.guest_ip vm_hash = generate_vm_hash(vm_object, pool_name)
unless maxloop == 0 return vm_hash['ip']
break if loop_count >= maxloop
loop_count += 1
end
end end
return ip
end end
def create_config_spec(vm_name, template_name, extra_config) def create_config_spec(vm_name, template_name, extra_config)
@ -611,13 +599,28 @@ module Vmpooler
boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime
powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState
ip_maxloop = 60
ip_loop_delay = 1
ip_loop_count = 1
ip = nil
while ip.nil?
sleep(ip_loop_delay)
ip = vm_object.guest_ip
unless ip_maxloop == 0
break if ip_loop_count >= ip_maxloop
ip_loop_count += 1
end
end
{ {
'name' => vm_object.name, 'name' => vm_object.name,
'hostname' => hostname, 'hostname' => hostname,
'template' => pool_configuration['template'], 'template' => pool_configuration['template'],
'poolname' => pool_name, 'poolname' => pool_name,
'boottime' => boottime, 'boottime' => boottime,
'powerstate' => powerstate 'powerstate' => powerstate,
'ip' => ip
} }
end end