From 9f2753bf356e44148db002af2e9f4d382a0b4738 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Tue, 18 Apr 2017 08:02:53 +0200 Subject: [PATCH] F #4913: Unmanaged disks are referenced using opennebula.disk vars in tm cpds --- src/tm_mad/vcenter/cpds | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/tm_mad/vcenter/cpds b/src/tm_mad/vcenter/cpds index 32834f009d..c9254cefd7 100755 --- a/src/tm_mad/vcenter/cpds +++ b/src/tm_mad/vcenter/cpds @@ -80,9 +80,10 @@ begin # If disk is unmanaged get the reference from template if disk["OPENNEBULA_MANAGED"] && disk["OPENNEBULA_MANAGED"] == "NO" - image_path = one_vm["USER_TEMPLATE/VCENTER_TEMPLATE_DISK_#{disk["DISK_ID"]}"] + unmanaged_keys = vm.get_unmanaged_keys + device_key = unmanaged_keys["opennebula.disk.#{disk["DISK_ID"]}"].to_i + image_path, source_ds_ref = vm.get_device_filename_and_ds_from_key(device_key) src_path = image_path.sub(/^\[(.*?)\] /, "") - source_ds_ref = one_vm["USER_TEMPLATE/VCENTER_TEMPLATE_DS_DISK_#{disk["DISK_ID"]}"] else # Get image source path src_path = VCenterDriver::FileHelper.get_img_name(disk, vmid, vm['name']) @@ -91,9 +92,6 @@ begin source_ds_vc = VCenterDriver::Datastore.new_from_ref(source_ds_ref, vi_client) - - - # Get target ds ref target_ds = VCenterDriver::VIHelper.one_item(OpenNebula::Datastore, target_ds_id) target_ds_ref = target_ds['TEMPLATE/VCENTER_DS_REF']