shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

F #4913: Unmanaged disks are referenced using opennebula.disk vars in tm cpds

Browse Source
This commit is contained in:
mcabrerizo 2017-04-18 08:02:53 +02:00
parent f5c9d4fd1b
commit 9f2753bf35
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tm_mad/vcenter/cpds
View File

@ -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']