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

Properly check if vm_hardware contains keys

Browse source 
This commit fixes #1475

Signed-off-by: Vyronas Tsingaras <vtsingaras@it.auth.gr>
This commit is contained in:
Vyronas Tsingaras 2015-06-18 14:23:43 +03:00 committed by Matt Clay
parent 262e86b36b
commit bdb33b5756
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/vmware/vsphere_guest.py
View file

@ -622,7 +622,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name
cpuHotRemoveEnabled = bool(vm.properties.config.cpuHotRemoveEnabled) cpuHotRemoveEnabled = bool(vm.properties.config.cpuHotRemoveEnabled)
# Change Memory # Change Memory
if vm_hardware['memory_mb']: if 'memory_mb' in vm_hardware:
if int(vm_hardware['memory_mb']) != vm.properties.config.hardware.memoryMB: if int(vm_hardware['memory_mb']) != vm.properties.config.hardware.memoryMB:
spec = spec_singleton(spec, request, vm) spec = spec_singleton(spec, request, vm)
@ -652,7 +652,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name
changes['memory'] = vm_hardware['memory_mb'] changes['memory'] = vm_hardware['memory_mb']
# ====( Config Memory )====# # ====( Config Memory )====#
if vm_hardware['num_cpus']: if 'num_cpus' in vm_hardware:
if int(vm_hardware['num_cpus']) != vm.properties.config.hardware.numCPU: if int(vm_hardware['num_cpus']) != vm.properties.config.hardware.numCPU:
spec = spec_singleton(spec, request, vm) spec = spec_singleton(spec, request, vm)