B #3844: Fix unchanged variables

Also, create correct host object for undeployed VMs on shutdown
This commit is contained in:
Tino Vazquez committed 2019-11-19 11:03:19 +01:00
1 parent accddef638
commit 4dd2b9d0a2
2 files changed
+4 -3

No files matched your search

@@ -936,7 +936,7 @@ module VCenterDriver
# Uses VM Templte if ref available, or the vCenter VM if not
# (latter case is if we are dealing with a Wild VM
def reference_disks(template_ref, disks, managed)
return [] if unmanaged_disks.emty? || instantiated_as_persistent?
return [] if disks.empty? || instantiated_as_persistent?
extraconfig = []
key_prefix = managed ? "opennebula.mdisk" : "opennebula.disk"
@@ -967,10 +967,10 @@ module VCenterDriver
vcenter_disk = vcenter_disks.select{|d| d[:key] == template_disk[:key]}.first
end
raise "disk with path #{unmanaged_disk_source} not found in the vCenter VM" if !vcenter_disk
raise "disk with path #{disk_source} not found in the vCenter VM" if !vcenter_disk
reference = {}
reference[:key] = "#{key_prefix}.#{unmanaged_disk["DISK_ID"]}"
reference[:key] = "#{key_prefix}.#{disk["DISK_ID"]}"
reference[:value] = "#{vcenter_disk[:key]}"
extraconfig << reference
end
+1
View File
@@ -63,6 +63,7 @@ begin
if vm_ref.empty?
one_vm = VCenterDriver::VIHelper.one_item(OpenNebula::VirtualMachine, vm_id)
host = OpenNebula::Host.new_with_id(host_id, OpenNebula::Client.new())
vcenter_vm = VCenterDriver::VIHelper.find_vcenter_vm_by_name(one_vm, host, vi_client)
raise "Could not find the undeployed VM in vCenter's inventory using it's name" if !vcenter_vm
vm_ref = vcenter_vm._ref