From 7a02c40bbc15df23a0257b9994572924ba045223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Fri, 10 May 2019 02:19:04 -0400 Subject: [PATCH] vmware: find_vmdk_file with trailing / (#55957) With the example, the `file_result.folderPath` of the file does not have any trailing '/'. `target_folder_path` is correctly generated and equal: `[nfs_1] images`. --- lib/ansible/module_utils/vmware.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/vmware.py b/lib/ansible/module_utils/vmware.py index 6dabbbbd03..0a14492e84 100644 --- a/lib/ansible/module_utils/vmware.py +++ b/lib/ansible/module_utils/vmware.py @@ -1276,11 +1276,14 @@ class PyVmomi(object): if not changed: self.module.fail_json(msg="No valid disk vmdk image found for path %s" % vmdk_path) - target_folder_path = datastore_name_sq + " " + vmdk_folder + '/' + target_folder_paths = [ + datastore_name_sq + " " + vmdk_folder + '/', + datastore_name_sq + " " + vmdk_folder, + ] for file_result in search_res.info.result: for f in getattr(file_result, 'file'): - if f.path == vmdk_filename and file_result.folderPath == target_folder_path: + if f.path == vmdk_filename and file_result.folderPath in target_folder_paths: return f self.module.fail_json(msg="No vmdk file found for path specified [%s]" % vmdk_path)