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

Treat the awx_1 node as a hybrid node for now, use local work type (#10726)

Browse Source
This commit is contained in:
Alan Rominger
2021-07-22 15:35:10 -04:00
parent 264c560a8a
commit 9881bb72b8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/ha.py
View File

@@ -209,7 +209,7 @@ class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin):
@property @property
def execution_capacity(self): def execution_capacity(self):
# TODO: update query to exclude based on node_type field # TODO: update query to exclude based on node_type field
return sum([inst.capacity for inst in self.instances.filter(version__startswith='ansible-runner-')]) return sum([inst.capacity for inst in self.instances.all()])
@property @property
def jobs_running(self): def jobs_running(self):

5
awx/main/tasks.py
View File

@@ -3231,7 +3231,10 @@ class AWXReceptorJob:
else: else:
work_type = 'kubernetes-incluster-auth' work_type = 'kubernetes-incluster-auth'
elif isinstance(self.task.instance, (Job, AdHocCommand)): elif isinstance(self.task.instance, (Job, AdHocCommand)):
work_type = 'ansible-runner' if self.task.instance.execution_node == self.task.instance.controller_node:
work_type = 'local'
else:
work_type = 'ansible-runner'
else: else:
work_type = 'local' work_type = 'local'