From ac7b2f1216eba89424476b85d68de369af2c68f7 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Mon, 4 Nov 2013 13:28:24 -0800 Subject: [PATCH] Use threaded destroy_vm function --- vmware-host-pooler | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/vmware-host-pooler b/vmware-host-pooler index 33a4f4f..4b2b2fa 100755 --- a/vmware-host-pooler +++ b/vmware-host-pooler @@ -253,22 +253,7 @@ loop do $logger.log('s', "[>] '#{vm}' moved to 'ready' queue") else - if ( - ($vsphere_helper.find_vms(vm)[vm]) and - ($vsphere_helper.find_vms(vm)[vm].runtime) - ) - start = Time.now - - if $vsphere_helper.find_vms(vm)[vm].runtime.powerState == 'poweredOn' - $logger.log('d', "[ ] '#{vm}' is being shut down") - $vsphere_helper.find_vms(vm)[vm].PowerOffVM_Task.wait_for_completion - end - - $vsphere_helper.find_vms(vm)[vm].Destroy_Task.wait_for_completion - finish = '%.2f' % (Time.now-start) - - $logger.log('s', "[-] '#{vm}' destroyed in #{finish} seconds") - end + destroy_vm(vm) end end