mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-27 02:18:41 -05:00
Merge 133bf7eb12 into 145ecb443f
This commit is contained in:
commit
1ab0c3c4e2
1 changed files with 78 additions and 80 deletions
|
|
@ -187,7 +187,6 @@ module Vmpooler
|
|||
# Clone a VM
|
||||
def clone_vm(template, folder, datastore, target, vsphere)
|
||||
Thread.new do
|
||||
begin
|
||||
vm = {}
|
||||
|
||||
if template =~ /\//
|
||||
|
|
@ -277,12 +276,11 @@ module Vmpooler
|
|||
$redis.decr('vmpooler__tasks__clone')
|
||||
|
||||
$metrics.timing("clone.#{vm['template']}", finish)
|
||||
end
|
||||
rescue => err
|
||||
$logger.log('s', "[!] [#{vm['template']}] '#{vm['hostname']}' failed while preparing to clone with an error: #{err}")
|
||||
raise
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Destroy a VM
|
||||
def destroy_vm(vm, pool, vsphere)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue