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

Only check VMs found in inventory

Browse source
This commit is contained in:
Scott Schneider 2013-12-04 11:37:51 -08:00
parent d581524b81
commit 2912056b45
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
vmware-host-pooler
View file

@ -214,12 +214,12 @@ def check_pool pool
$redis.smembers('vmware_host_pool__running__'+pool['name']).each do |vm| $redis.smembers('vmware_host_pool__running__'+pool['name']).each do |vm|
if (! inventory[vm]) if (! inventory[vm])
$redis.srem('vmware_host_pool__running__'+pool['name'], vm) $redis.srem('vmware_host_pool__running__'+pool['name'], vm)
end
if (pool['running_ttl'])
check_running_vm(vm, pool['name'], pool['running_ttl'])
else else
check_running_vm(vm, pool['name'], '720') if (pool['running_ttl'])
check_running_vm(vm, pool['name'], pool['running_ttl'])
else
check_running_vm(vm, pool['name'], '720')
end
end end
end end
@ -227,10 +227,10 @@ def check_pool pool
$redis.smembers('vmware_host_pool__ready__'+pool['name']).each do |vm| $redis.smembers('vmware_host_pool__ready__'+pool['name']).each do |vm|
if (! inventory[vm]) if (! inventory[vm])
$redis.srem('vmware_host_pool__ready__'+pool['name'], vm) $redis.srem('vmware_host_pool__ready__'+pool['name'], vm)
end else
if (pool['ready_ttl'])
if (pool['ready_ttl']) check_ready_vm(vm, pool['name'], pool['ready_ttl'])
check_ready_vm(vm, pool['name'], pool['ready_ttl']) end
end end
end end
@ -238,16 +238,18 @@ def check_pool pool
$redis.smembers('vmware_host_pool__pending__'+pool['name']).each do |vm| $redis.smembers('vmware_host_pool__pending__'+pool['name']).each do |vm|
pool['timeout'] ||= 10 pool['timeout'] ||= 10
check_pending_vm(vm, pool['name'], pool['timeout']) if (inventory[vm])
check_pending_vm(vm, pool['name'], pool['timeout'])
end
end end
# COMPLETED # COMPLETED
$redis.smembers('vmware_host_pool__completed__'+pool['name']).each do |vm| $redis.smembers('vmware_host_pool__completed__'+pool['name']).each do |vm|
if (! inventory[vm]) if (! inventory[vm])
$redis.srem('vmware_host_pool__completed__'+pool['name'], vm) $redis.srem('vmware_host_pool__completed__'+pool['name'], vm)
else
destroy_vm(vm, pool['name'])
end end
destroy_vm(vm, pool['name'])
end end
# REPOPULATE # REPOPULATE