From f45afe4e2e67087a1d13667244973ac2c635df75 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 12 May 2021 18:37:39 +0200 Subject: [PATCH] M #-: Correct OpenNebula spelling --- .../remotes/lib/vcenter_driver/vcenter_importer.rb | 4 ++-- src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb index 9b4321fa27..d128a57f0a 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb @@ -496,9 +496,9 @@ module VCenterDriver end # - # Create and allocate a Opennebula Object. + # Create and allocate a OpenNebula Object. # - # @param info [String] Info passed to opennebula Core. + # @param info [String] Info passed to OpenNebula Core. # # @return [&block] the allocated object through a block. # 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 bcce7cfa59..eb857c72a8 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -2624,15 +2624,15 @@ end # - The disk is managed by OpenNebula detachable= !(one_vm['LCM_STATE'].to_i == 11 && !disk.managed?) detachable &&= disk.exists? - + return unless detachable detach_disk(disk) # Check if we want to keep the non persistent disk keep_non_persistent_disks = - VCenterDriver::CONFIG[:keep_non_persistent_disks] - + VCenterDriver::CONFIG[:keep_non_persistent_disks] + return if keep_non_persistent_disks == true disk.destroy @@ -2829,7 +2829,7 @@ end # Convert VM to template in vCenter mark_as_template - # Edit the Opennebula template + # Edit the OpenNebula template one_client = OpenNebula::Client.new template_id = one_item['TEMPLATE/TEMPLATE_ID'] new_template = OpenNebula::Template.new_with_id(template_id,