mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Don't update cpu/memory allocation in configspec if there is no change. (#39790)
Fixes #38941
This commit is contained in:
parent
c6270e15a6
commit
0296c8466a
1 changed files with 20 additions and 14 deletions
|
@ -716,8 +716,9 @@ class PyVmomiHelper(PyVmomi):
|
|||
:param vm_obj: VM object in case of reconfigure, None in case of deploy
|
||||
:return: None
|
||||
"""
|
||||
self.configspec.memoryAllocation = vim.ResourceAllocationInfo()
|
||||
self.configspec.cpuAllocation = vim.ResourceAllocationInfo()
|
||||
rai_change_detected = False
|
||||
memory_allocation = vim.ResourceAllocationInfo()
|
||||
cpu_allocation = vim.ResourceAllocationInfo()
|
||||
|
||||
if 'hardware' in self.params:
|
||||
if 'mem_limit' in self.params['hardware']:
|
||||
|
@ -726,9 +727,9 @@ class PyVmomiHelper(PyVmomi):
|
|||
mem_limit = int(self.params['hardware'].get('mem_limit'))
|
||||
except ValueError as e:
|
||||
self.module.fail_json(msg="hardware.mem_limit attribute should be an integer value.")
|
||||
self.configspec.memoryAllocation.limit = mem_limit
|
||||
if vm_obj is None or self.configspec.memoryAllocation.limit != vm_obj.config.memoryAllocation.limit:
|
||||
self.change_detected = True
|
||||
memory_allocation.limit = mem_limit
|
||||
if vm_obj is None or memory_allocation.limit != vm_obj.config.memoryAllocation.limit:
|
||||
rai_change_detected = True
|
||||
|
||||
if 'mem_reservation' in self.params['hardware']:
|
||||
mem_reservation = None
|
||||
|
@ -737,10 +738,10 @@ class PyVmomiHelper(PyVmomi):
|
|||
except ValueError as e:
|
||||
self.module.fail_json(msg="hardware.mem_reservation should be an integer value.")
|
||||
|
||||
self.configspec.memoryAllocation.reservation = mem_reservation
|
||||
memory_allocation.reservation = mem_reservation
|
||||
if vm_obj is None or \
|
||||
self.configspec.memoryAllocation.reservation != vm_obj.config.memoryAllocation.reservation:
|
||||
self.change_detected = True
|
||||
memory_allocation.reservation != vm_obj.config.memoryAllocation.reservation:
|
||||
rai_change_detected = True
|
||||
|
||||
if 'cpu_limit' in self.params['hardware']:
|
||||
cpu_limit = None
|
||||
|
@ -748,9 +749,9 @@ class PyVmomiHelper(PyVmomi):
|
|||
cpu_limit = int(self.params['hardware'].get('cpu_limit'))
|
||||
except ValueError as e:
|
||||
self.module.fail_json(msg="hardware.cpu_limit attribute should be an integer value.")
|
||||
self.configspec.cpuAllocation.limit = cpu_limit
|
||||
if vm_obj is None or self.configspec.cpuAllocation.limit != vm_obj.config.cpuAllocation.limit:
|
||||
self.change_detected = True
|
||||
cpu_allocation.limit = cpu_limit
|
||||
if vm_obj is None or cpu_allocation.limit != vm_obj.config.cpuAllocation.limit:
|
||||
rai_change_detected = True
|
||||
|
||||
if 'cpu_reservation' in self.params['hardware']:
|
||||
cpu_reservation = None
|
||||
|
@ -758,10 +759,15 @@ class PyVmomiHelper(PyVmomi):
|
|||
cpu_reservation = int(self.params['hardware'].get('cpu_reservation'))
|
||||
except ValueError as e:
|
||||
self.module.fail_json(msg="hardware.cpu_reservation should be an integer value.")
|
||||
self.configspec.cpuAllocation.reservation = cpu_reservation
|
||||
cpu_allocation.reservation = cpu_reservation
|
||||
if vm_obj is None or \
|
||||
self.configspec.cpuAllocation.reservation != vm_obj.config.cpuAllocation.reservation:
|
||||
self.change_detected = True
|
||||
cpu_allocation.reservation != vm_obj.config.cpuAllocation.reservation:
|
||||
rai_change_detected = True
|
||||
|
||||
if rai_change_detected:
|
||||
self.configspec.memoryAllocation = memory_allocation
|
||||
self.configspec.cpuAllocation = cpu_allocation
|
||||
self.change_detected = True
|
||||
|
||||
def configure_cpu_and_memory(self, vm_obj, vm_creation=False):
|
||||
# set cpu/memory/etc
|
||||
|
|
Loading…
Reference in a new issue