a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

first path check missing forward slash between dcpath and datacenter (#31481) 

* fixed folder path logic

* fixed folder path logic

* fixed folder path logic
pull/4420/head
Mike Klebolt 2017-10-10 02:14:12 -05:00 committed by ansibot
parent 2b63ae61f2
commit ada6159ece
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/modules/cloud/vmware/vmware_guest.py
View File

@ -1110,7 +1110,8 @@ class PyVmomiHelper(PyVmomi):
dcpath = compile_folder_path_for_object(datacenter)
# Check for full path first in case it was already supplied
if (self.params['folder'].startswith(dcpath + self.params['datacenter'] + '/vm')):
if (self.params['folder'].startswith(dcpath + self.params['datacenter'] + '/vm') or
self.params['folder'].startswith(dcpath + '/' + self.params['datacenter'] + '/vm')):
fullpath = self.params['folder']
elif (self.params['folder'].startswith('/vm/') or self.params['folder'] == '/vm'):
fullpath = "%s%s%s" % (dcpath, self.params['datacenter'], self.params['folder'])