From 3c8a517699a5a655e0c0b619f64c1686c9b02203 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 1 Mar 2022 16:32:22 +0100 Subject: [PATCH] F #5756: Make image persistency configurable on images coming from VM Template or Wild VM disks --- .../remotes/lib/vcenter_driver/vm_template.rb | 14 +++++++++++++- src/vmm_mad/remotes/vcenter/vcenterrc | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb index c48047ce8a..fb16ff31da 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb @@ -408,13 +408,25 @@ module VCenterDriver break end + # Read configuration for imported images, taking + # into account if we are importing a VM Tempalte + # or a Wild VM + image_persistency = nil + if vm? + image_persistency = :wild_vm_persistent_images + else + image_persistency = :vm_template_persistent_images + end + + image_persistency = VCenterDriver::CONFIG[image_persistency] + params = { :disk => disk, :ipool => ipool, :_type => type, :ds_id => datastore_found['ID'], :opts => { - :persistent => vm? ? 'YES':'NO' + :persistent => image_persistency ? 'YES':'NO' }, :images => images } diff --git a/src/vmm_mad/remotes/vcenter/vcenterrc b/src/vmm_mad/remotes/vcenter/vcenterrc index 20dd78b647..7f9c81f16d 100644 --- a/src/vmm_mad/remotes/vcenter/vcenterrc +++ b/src/vmm_mad/remotes/vcenter/vcenterrc @@ -46,3 +46,11 @@ # Set to true if you need OpenNebula avoid change imported MAC :keep_mac_on_imported: false + +# Set to true to have Wild VM disks importent as persistent images, +# otherwise they will be imported as non persistent +:wild_vm_persistent_images: true + +# Set to true to have Wild VM disks importent as persistent images, +# otherwise they will be imported as non persistent +:vm_template_persistent_images: false