B #2477 VCENTER_ESX_HOST fail with DRS in vCenter (#2478)

(cherry picked from commit 2571365)
OpenNebula · Oct 5, 2018 · 2d4b7cb · 2d4b7cb
1 parent 3d8f6c0
commit 2d4b7cb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb
@@ -213,9 +213,7 @@ def proxy(vm_resource)
 
         # 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
@@ -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
@@ -2903,8 +2903,6 @@ def migrate(config = {})
             #@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 @@ def self.migrate_routine(vm_id, src_host, dst_host, ds = nil)
         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
@@ -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}\"."