From d501afd5051a0865469222b3a2d19429c6de62c2 Mon Sep 17 00:00:00 2001 From: Sergio Semedi Barranco Date: Wed, 5 Sep 2018 16:58:38 +0200 Subject: [PATCH] B #2274: it is possible to remove disk from vCenter templates (#2383) (cherry picked from commit ca5b1f72101ce8cf4495eecf8b66539ec914442f) --- src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 f28c26c0fa..ddaa118c89 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -2241,11 +2241,9 @@ class VirtualMachine < Template persistent = VCenterDriver::VIHelper.find_persistent_image_by_source(source, ipool) if !persistent - detach_disk_array << { - :fileOperation => :destroy, - :operation => :remove, - :device => d[:device] - } + op = {operation: :remove, device: d[:device]} + op[:fileOperation] = :destroy unless d[:type] == "CDROM" + detach_disk_array << op end # Remove reference opennebula.disk if exist