From 16ca4cbb41c25531cc5f049eaaf6c730bfaae602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Thu, 27 May 2021 12:20:50 +0200 Subject: [PATCH] L #-: Minor linting changes (#1253) --- src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb | 4 ++-- src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb | 5 +++-- src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb b/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb index 3a1b9ce4f8..6d0fd4b99d 100644 --- a/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb +++ b/src/vmm_mad/remotes/lib/firecracker/opennebula_vm.rb @@ -79,7 +79,7 @@ class FirecrackerVM < OpenNebulaVM @exec_file = @fcrc[:firecracker_location] end - # Returns a Hash representing the Firecracker configuration for this OpenNebulaVM + # Returns a Hash representing the Firecracker configuration for the VM def to_fc fc = {} @@ -156,7 +156,7 @@ class FirecrackerVM < OpenNebulaVM initrd = @xml['//TEMPLATE/OS/INITRD'] - return if (initrd.nil? || initrd.empty?) + return if initrd.nil? || initrd.empty? hash['initrd_path'] = File.basename(initrd, '/') end diff --git a/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb b/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb index 20f73ad13e..b72c770169 100644 --- a/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb +++ b/src/vmm_mad/remotes/lib/lxc/opennebula_vm.rb @@ -44,7 +44,7 @@ class LXCConfiguration < Hash :command => 'sudo lxc-console' }, :datastore_location => '/var/lib/one/datastores', - :default_lxc_config => '/usr/share/lxc/config/common.conf', + :default_lxc_config => '/usr/share/lxc/config/common.conf' } # Configuration attributes that are not customizable @@ -378,7 +378,8 @@ class Disk end if device.empty? - OpenNebula.log_error("Cannot detect block device from #{@mountpoint}") + msg = "Cannot detect block device from #{@mountpoint}" + OpenNebula.log_error(msg) end device diff --git a/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb b/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb index 3a69b11e3a..791f820ab3 100644 --- a/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb +++ b/src/vmm_mad/remotes/lib/lxc/storage/storageutils.rb @@ -60,7 +60,7 @@ module Storage resize_ext(device) end - # Mount device in mapper folder //mapper/disk.id + # Mount device in mapper folder //mapper/disk.id return false unless mount(device, mountpoint) # Resize device if xfs like filesystem is used @@ -175,7 +175,7 @@ module Storage true end - # Adds path to the partition Hash. This is needed for lsblk version < 2.33 + # Adds path to the partition Hash. Required for lsblk version < 2.33 def lsblk_path(p) return unless !p['path'] && p['name']