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

Revert "Only correlate Redis inventory with vCenter on startup"

Browse source 
This reverts commit 658496f776f684dfcc31d8423bbafff38ea94e27.
This commit is contained in:
Scott Schneider 2013-11-05 14:13:09 -08:00
parent b7f922fb11
commit 71a9150631
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vmware-host-pooler
View file

@ -75,7 +75,6 @@ def clone_vm template, pool, folder, datastore
# Add VM to Redis inventory ('pending' pool) # Add VM to Redis inventory ('pending' pool)
$redis.sadd('vmware_host_pool__pending__'+vm['template'], vm['hostname']) $redis.sadd('vmware_host_pool__pending__'+vm['template'], vm['hostname'])
inventory[vm] = 1
# Annotate with creation time, origin template, etc. # Annotate with creation time, origin template, etc.
configSpec = RbVmomi::VIM.VirtualMachineConfigSpec( configSpec = RbVmomi::VIM.VirtualMachineConfigSpec(
@ -135,8 +134,6 @@ def destroy_vm vm, pool
host.Destroy_Task.wait_for_completion host.Destroy_Task.wait_for_completion
finish = '%.2f' % (Time.now-start) finish = '%.2f' % (Time.now-start)
inventory.delete(vm)
$logger.log('s', "[-] [#{pool}] '#{vm}' destroyed in #{finish} seconds") $logger.log('s', "[-] [#{pool}] '#{vm}' destroyed in #{finish} seconds")
end end
} }
@ -148,6 +145,7 @@ pools.each do |pool|
puts "Starting new worker thread for pool '#{pool['name']}'" puts "Starting new worker thread for pool '#{pool['name']}'"
Thread.new { Thread.new {
loop do
# INVENTORY # INVENTORY
inventory = {} inventory = {}
base = $vsphere_helper.find_pool(pool['pool']) base = $vsphere_helper.find_pool(pool['pool'])
@ -164,7 +162,6 @@ pools.each do |pool|
inventory[vm['name']] = 1 inventory[vm['name']] = 1
end end
loop do
# 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])
@ -174,9 +171,12 @@ pools.each do |pool|
# PENDING # PENDING
$redis.smembers('vmware_host_pool__pending__'+pool['name']).each do |vm| $redis.smembers('vmware_host_pool__pending__'+pool['name']).each do |vm|
if (! inventory[vm]) #
$redis.srem('vmware_host_pool__pending__'+pool['name'], vm) # This causes a race condition where more than one VM is cloned
end #
# if (! inventory[vm])
# $redis.srem('vmware_host_pool__pending__'+pool['name'], vm)
# end
check_vm(vm, pool['name']) check_vm(vm, pool['name'])
end end