cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

VMware: add trailing / in case of nested folders (#33479)

Browse source 
This fix adds a trailing / in case of nested folders.

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2017-12-12 07:57:34 +05:30 committed by GitHub
parent 38b8d62e68
commit 8d61583c02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/vmware/vmware_guest.py
View file

@ -1339,13 +1339,17 @@ class PyVmomiHelper(PyVmomi):
dcpath = compile_folder_path_for_object(datacenter)
# Nested folder does not have trailing /
if not dcpath.endswith('/'):
dcpath += '/'
# Check for full path first in case it was already supplied
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'):
elif self.params['folder'].startswith('/vm/') or self.params['folder'] == '/vm':
fullpath = "%s%s%s" % (dcpath, self.params['datacenter'], self.params['folder'])
elif (self.params['folder'].startswith('/')):
elif self.params['folder'].startswith('/'):
fullpath = "%s%s/vm%s" % (dcpath, self.params['datacenter'], self.params['folder'])
else:
fullpath = "%s%s/vm/%s" % (dcpath, self.params['datacenter'], self.params['folder'])