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

vmware_guest: do not assume disk params contain a datastore (#2974)

Browse source 
* vmware_guest: do not assume disk params contain a datastore
* Fix missed line during connection refactor
This commit is contained in:
jctanner 2016-09-19 16:25:44 -04:00 committed by Matt Clay
parent f3e2f5d002
commit 4cb3e87ca4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/extras/cloud/vmware/vmware_guest.py
View file

@ -294,7 +294,7 @@ class PyVmomiHelper(object):
folder_path = None folder_path = None
if uuid: if uuid:
vm = self.si.content.searchIndex.FindByUuid(uuid=uuid, vmSearch=True) vm = self.content.searchIndex.FindByUuid(uuid=uuid, vmSearch=True)
elif folder: elif folder:
@ -532,14 +532,19 @@ class PyVmomiHelper(object):
hostsystem = get_obj(self.content, [vim.HostSystem], self.params['esxi_hostname']) hostsystem = get_obj(self.content, [vim.HostSystem], self.params['esxi_hostname'])
# set the destination datastore in the relocation spec # set the destination datastore in the relocation spec
datastore_name = None
datastore = None
if self.params['disk']: if self.params['disk']:
if 'datastore' in self.params['disk'][0]:
datastore_name = self.params['disk'][0]['datastore'] datastore_name = self.params['disk'][0]['datastore']
datastore = get_obj(self.content, [vim.Datastore], datastore_name) datastore = get_obj(self.content, [vim.Datastore], datastore_name)
else: if not datastore:
# use the template's existing DS # use the template's existing DS
disks = [x for x in template.config.hardware.device if isinstance(x, vim.vm.device.VirtualDisk)] disks = [x for x in template.config.hardware.device if isinstance(x, vim.vm.device.VirtualDisk)]
datastore = disks[0].backing.datastore datastore = disks[0].backing.datastore
datastore_name = datastore.name datastore_name = datastore.name
if not datastore:
self.module.fail_json(msg="Failed to find a matching datastore")
# create the relocation spec # create the relocation spec
relospec = vim.vm.RelocateSpec() relospec = vim.vm.RelocateSpec()