From 677e99e3758a8ff6c49fd0c02931fb4588bb29ed Mon Sep 17 00:00:00 2001 From: Dann Bohn Date: Mon, 23 Jun 2014 11:16:03 -0400 Subject: [PATCH] force evaluation of vars memory_mb, num_cpus to be int fixes #7903 --- library/cloud/vsphere_guest | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library/cloud/vsphere_guest b/library/cloud/vsphere_guest index 2a02b933b20..efb35de2fcd 100644 --- a/library/cloud/vsphere_guest +++ b/library/cloud/vsphere_guest @@ -496,7 +496,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name # Change Memory if vm_hardware['memory_mb']: - if 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) if vm.is_powered_on(): @@ -504,7 +504,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name # No hot add but force if not memoryHotAddEnabled: shutdown = True - elif vm_hardware['memory_mb'] < vm.properties.config.hardware.memoryMB: + elif int(vm_hardware['memory_mb']) < vm.properties.config.hardware.memoryMB: shutdown = True else: # Fail on no hot add and no force @@ -514,7 +514,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name "required for shutdown") # Fail on no force and memory shrink - elif vm_hardware['memory_mb'] < vm.properties.config.hardware.memoryMB: + elif int(vm_hardware['memory_mb']) < vm.properties.config.hardware.memoryMB: module.fail_json( msg="Cannot lower memory on a live VM. force is " "required for shutdown") @@ -525,7 +525,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name # ====( Config Memory )====# if vm_hardware['num_cpus']: - if 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) if vm.is_powered_on(): @@ -533,7 +533,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name # No hot add but force if not cpuHotAddEnabled: shutdown = True - elif vm_hardware['num_cpus'] < vm.properties.config.hardware.numCPU: + elif int(vm_hardware['num_cpus']) < vm.properties.config.hardware.numCPU: if not cpuHotRemoveEnabled: shutdown = True else: @@ -544,7 +544,7 @@ def reconfigure_vm(vsphere_client, vm, module, esxi, resource_pool, cluster_name "required for shutdown") # Fail on no force and cpu shrink without hot remove - elif vm_hardware['num_cpus'] < vm.properties.config.hardware.numCPU: + elif int(vm_hardware['num_cpus']) < vm.properties.config.hardware.numCPU: if not cpuHotRemoveEnabled: module.fail_json( msg="Cannot lower CPU on a live VM without "