puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update pool_manager and vsphere tests to support changes in host selection

Browse source
This commit is contained in:
kirby@puppetlabs.com 2017-10-13 18:06:21 -07:00 • committed by mattkirby
parent 3050a22d62
commit 23242a7b1c
4 changed files with 578 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/vmpooler/pool_manager.rb
View file

@ -542,7 +542,7 @@ module Vmpooler
def migrate_vm(vm_name, pool_name, provider)
Thread.new do
begin
_migrate_vm(vm_name, pool_name, provider, $provider_hosts)
_migrate_vm(vm_name, pool_name, provider)
rescue => err
$logger.log('s', "[x] [#{pool_name}] '#{vm_name}' migration failed with an error: #{err}")
remove_vmpooler_migration_vm(pool_name, vm_name)

17
lib/vmpooler/providers/vsphere.rb
View file

@ -178,17 +178,12 @@ module Vmpooler
vm_target_folder = find_folder(target_folder_path, connection, target_datacenter_name)
rescue => _err
if _err =~ /Unexpected object type encountered/
vm_target_folder = nil
else
raise(_err)
end
end
if vm_target_folder.nil?
if $config[:config]['create_folders'] == true
dc = connection.serviceInstance.find_datacenter(target_datacenter_name)
vm_target_folder = dc.vmFolder.traverse(target_folder_path, type=RbVmomi::VIM::Folder, create=true)
else
raise("Unexpected object type encountered while finding folder")
if $config[:config]['create_folders'] == true
dc = connection.serviceInstance.find_datacenter(target_datacenter_name)
vm_target_folder = dc.vmFolder.traverse(target_folder_path, type=RbVmomi::VIM::Folder, create=true)
else
raise(_err)
end
end
end