Only check VMs found in inventory

This commit is contained in:
Scott Schneider 2013-12-04 11:37:51 -08:00
parent d581524b81
commit 2912056b45

View file

@ -214,41 +214,43 @@ 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 else
if (pool['running_ttl']) if (pool['running_ttl'])
check_running_vm(vm, pool['name'], pool['running_ttl']) check_running_vm(vm, pool['name'], pool['running_ttl'])
else else
check_running_vm(vm, pool['name'], '720') check_running_vm(vm, pool['name'], '720')
end end
end end
end
# READY # READY
$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
# PENDING # PENDING
$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
if (inventory[vm])
check_pending_vm(vm, pool['name'], pool['timeout']) 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)
end else
destroy_vm(vm, pool['name']) destroy_vm(vm, pool['name'])
end end
end
# REPOPULATE # REPOPULATE
total = $redis.scard('vmware_host_pool__ready__'+pool['name']) + total = $redis.scard('vmware_host_pool__ready__'+pool['name']) +