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

Clean up the 'deploy_vm' method

Browse source 
Removing duplicate lines of code better accomplished with a '||'
fallback to the 'find_vm_heavy' method.
This commit is contained in:
Scott Schneider 2014-02-05 12:41:54 -08:00
parent c286b44553
commit dc2cbbe712
1 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
vmware-host-pooler
View file

@ -217,7 +217,8 @@ def destroy_vm vm, pool
$redis.hdel('vmware_host_pool__active__'+pool, vm) $redis.hdel('vmware_host_pool__active__'+pool, vm)
$redis.del('vmware_host_pool__vm__'+vm) $redis.del('vmware_host_pool__vm__'+vm)
host = $vsphere[pool].find_vm(vm) host = $vsphere[pool].find_vm(vm) ||
$vsphere[pool].find_vm_heavy(vm)[vm]
if (host) if (host)
start = Time.now start = Time.now
@ -237,28 +238,6 @@ def destroy_vm vm, pool
$logger.log('s', "[-] [#{pool}] '#{vm}' destroyed in #{finish} seconds") $logger.log('s', "[-] [#{pool}] '#{vm}' destroyed in #{finish} seconds")
$graphite.log("vcloud.destroy.#{pool}", finish) if defined? $graphite $graphite.log("vcloud.destroy.#{pool}", finish) if defined? $graphite
else
host = $vsphere[pool].find_vm_heavy(vm)[vm]
if (host)
start = Time.now
if (
(host.runtime) and
(host.runtime.powerState) and
(host.runtime.powerState == 'poweredOn')
)
$logger.log('d', "[ ] [#{pool}] '#{vm}' is being shut down")
host.PowerOffVM_Task.wait_for_completion
end
host.Destroy_Task.wait_for_completion
finish = '%.2f' % (Time.now-start)
$logger.log('s', "[-] [#{pool}] '#{vm}' destroyed in #{finish} seconds")
$graphite.log("vcloud.destroy.#{pool}", finish) if defined? $graphite
end
end end
} }
end end