From 25713651869a16dd7940c2f7cca8aefc2b0e12ef Mon Sep 17 00:00:00 2001 From: Jose Angel Garrido Montoya Date: Fri, 5 Oct 2018 15:43:34 +0200 Subject: [PATCH] B #2477 VCENTER_ESX_HOST fail with DRS in vCenter (#2478) --- src/sunstone/OpenNebulaVNC.rb | 4 +--- src/vmm_mad/remotes/lib/vcenter_driver/importer.rb | 1 - src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb | 6 ++---- src/vmm_mad/remotes/vcenter/deploy | 4 +--- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 31cc760c99..0451bb9a34 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -213,9 +213,7 @@ class OpenNebulaVNC # If it is a vCenter VM if vm_resource['USER_TEMPLATE/HYPERVISOR'] == "vcenter" - if vm_resource['USER_TEMPLATE/VCENTER_ESX_HOST'] - host = vm_resource['USER_TEMPLATE/VCENTER_ESX_HOST'] - elsif vm_resource['MONITORING/VCENTER_ESX_HOST'] + if vm_resource['MONITORING/VCENTER_ESX_HOST'] host = vm_resource['MONITORING/VCENTER_ESX_HOST'] else return error(400,"Could not determine the vCenter ESX host where the VM is running. Wait till the VCENTER_ESX_HOST attribute is retrieved once the host has been monitored") diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb index cc11d8072b..8839558d20 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb @@ -71,7 +71,6 @@ def self.import_wild(host_id, vm_ref, one_vm, template) end template << template_nics - template << "VCENTER_ESX_HOST = #{vcenter_vm["runtime.host.name"].to_s}\n" # Get DS_ID for the deployment, the wild VM needs a System DS dc_ref = vcenter_vm.get_dc.item._ref diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb index 3fa4027c8a..1ca14ea7bd 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -2903,8 +2903,6 @@ class VirtualMachine < Template #@item.RelocateVM_Task(spec: relocate_spec, priority: "defaultPriority").wait_for_completion @item.MigrateVM_Task(:pool=> resourcepool, :priority => "defaultPriority").wait_for_completion - - return get_esx_name rescue Exception => e raise "Cannot migrate VM #{e.message}\n#{e.backtrace.join("\n")}" end @@ -3363,9 +3361,9 @@ class VirtualMachine < Template vc_host = VCenterDriver::ClusterComputeResource.new_from_ref(ccr_ref, vi_client).item config = { :cluster => vc_host } - esx = vc_vm.migrate(config) + vc_vm.migrate(config) - vm.replace({ 'VCENTER_CCR_REF' => ccr_ref, 'VCENTER_ESX_HOST' => esx }) + vm.replace({'VCENTER_CCR_REF' => ccr_ref}) end # Try to build the vcenterdriver virtualmachine without diff --git a/src/vmm_mad/remotes/vcenter/deploy b/src/vmm_mad/remotes/vcenter/deploy index c7d13e056f..4b80e46bbd 100755 --- a/src/vmm_mad/remotes/vcenter/deploy +++ b/src/vmm_mad/remotes/vcenter/deploy @@ -68,10 +68,8 @@ begin vm.reconfigure vm.poweron vm.set_running(true) - - vm.one_item.update("VCENTER_ESX_HOST = #{vm['runtime.host.name']}", true) - puts vm['_ref'] + rescue StandardError => e message = "Deploy of VM #{vm_id} on vCenter cluster #{cluster_name} " \ "with #{dfile} failed due to \"#{e.message}\"."