External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-05 03:18:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

Corresponding AWX changes for runner --worker-info schema update (#10926)

Browse Source
This commit is contained in:
Alan Rominger
2021-08-24 08:30:55 -04:00
parent c3ad479fc6
commit 940c189c12
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/utils/receptor.py
View File

@@ -16,7 +16,7 @@ def worker_info(node_name):
receptor_ctl = get_receptor_ctl()
transmit_start = time.time()
error_list = []
data = {'Errors': error_list, 'transmit_timing': 0.0}
data = {'errors': error_list, 'transmit_timing': 0.0}
result = receptor_ctl.submit_work(worktype='ansible-runner', payload='', params={"params": f"--worker-info"}, ttl='20s', node=node_name)
@@ -71,7 +71,12 @@ def worker_info(node_name):
if not isinstance(remote_data, dict):
error_list.append(f'Remote node {node_name} --worker-info output is not a YAML dict, output:{stdout}')
else:
error_list.extend(remote_data.pop('Errors')) # merge both error lists
error_list.extend(remote_data.pop('errors', [])) # merge both error lists
data.update(remote_data)
# see tasks.py usage of keys
missing_keys = set(('runner_version', 'mem_in_bytes', 'cpu_count')) - set(data.keys())
if missing_keys:
data['errors'].append('Worker failed to return keys {}'.format(' '.join(missing_keys)))
return data