From e04dba14e4554424eb835c4e33dff92f9ed67644 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Wed, 28 Jun 2017 15:23:46 +0200 Subject: [PATCH] Enable rm_directory for vcenter 6.5 --- src/datastore_mad/remotes/vcenter/rm | 3 +-- src/tm_mad/vcenter/delete | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/datastore_mad/remotes/vcenter/rm b/src/datastore_mad/remotes/vcenter/rm index 35f96c6af5..131f8da618 100755 --- a/src/datastore_mad/remotes/vcenter/rm +++ b/src/datastore_mad/remotes/vcenter/rm @@ -79,8 +79,7 @@ begin ds.delete_file(img_src) end - vcenter_version = vi_client.vim.serviceContent.about.apiVersion - ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5" + ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) rescue Exception => e if !e.message.start_with?('FileNotFound') diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete index f300243587..83ad9efc20 100755 --- a/src/tm_mad/vcenter/delete +++ b/src/tm_mad/vcenter/delete @@ -119,8 +119,7 @@ if path.match(/disk\.\d+$/) ds.delete_virtual_disk(img_path) img_dir = File.dirname(img_path) - vcenter_version = vi_client.vim.serviceContent.about.apiVersion - ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5" + ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) rescue Exception => e if !e.message.start_with?('FileNotFound')