From c6c14d4fb97d06a3956c9c772731b8dcfc7e9732 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Fri, 3 May 2019 15:30:16 -0400 Subject: [PATCH] properly record Instance.cpu and Instance.memory for isolated nodes --- awx/main/isolated/manager.py | 6 +++++- awx/plugins/isolated/awx_capacity.py | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/awx/main/isolated/manager.py b/awx/main/isolated/manager.py index cc76e7aac4..5ed2f50e40 100644 --- a/awx/main/isolated/manager.py +++ b/awx/main/isolated/manager.py @@ -299,12 +299,14 @@ class IsolatedManager(object): if instance.capacity == 0 and task_result['capacity_cpu']: logger.warning('Isolated instance {} has re-joined.'.format(instance.hostname)) + instance.cpu = int(task_result['cpu']) + instance.memory = int(task_result['mem']) instance.cpu_capacity = int(task_result['capacity_cpu']) instance.mem_capacity = int(task_result['capacity_mem']) instance.capacity = get_system_task_capacity(scale=instance.capacity_adjustment, cpu_capacity=int(task_result['capacity_cpu']), mem_capacity=int(task_result['capacity_mem'])) - instance.save(update_fields=['cpu_capacity', 'mem_capacity', 'capacity', 'version', 'modified']) + instance.save(update_fields=['cpu', 'memory', 'cpu_capacity', 'mem_capacity', 'capacity', 'version', 'modified']) def health_check(self, instance_qs): ''' @@ -343,6 +345,8 @@ class IsolatedManager(object): logger.exception('Failed to read status from isolated instances') if 'awx_capacity_cpu' in task_result and 'awx_capacity_mem' in task_result: task_result = { + 'cpu': task_result['awx_cpu'], + 'mem': task_result['awx_mem'], 'capacity_cpu': task_result['awx_capacity_cpu'], 'capacity_mem': task_result['awx_capacity_mem'], 'version': task_result['awx_capacity_version'] diff --git a/awx/plugins/isolated/awx_capacity.py b/awx/plugins/isolated/awx_capacity.py index f6e5b138b3..ccfc332b8c 100644 --- a/awx/plugins/isolated/awx_capacity.py +++ b/awx/plugins/isolated/awx_capacity.py @@ -57,13 +57,15 @@ def main(): module.fail_json(msg=str(e)) return # NOTE: Duplicated with awx.main.utils.common capacity utilities - _, capacity_cpu = get_cpu_capacity() - _, capacity_mem = get_mem_capacity() + cpu, capacity_cpu = get_cpu_capacity() + mem, capacity_mem = get_mem_capacity() # Module never results in a change module.exit_json(changed=False, capacity_cpu=capacity_cpu, capacity_mem=capacity_mem, version=version, ansible_facts=dict( + awx_cpu=cpu, + awx_mem=mem, awx_capacity_cpu=capacity_cpu, awx_capacity_mem=capacity_mem, awx_capacity_version=version