External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Undo some things not compatible with hybrid node hack (#10763)

Browse Source
This commit is contained in:
Alan Rominger
2021-07-28 13:33:35 -04:00
parent 46ccc58749
commit b53d3bc81d
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,6 +128,7 @@ class Instance(HasPolicyEditsMixin, BaseModel):
@staticmethod @staticmethod
def choose_online_control_plane_node(): def choose_online_control_plane_node():
# TODO: update query to use node_type field
return random.choice(Instance.objects.filter(enabled=True).exclude(version__startswith='ansible-runner-').values_list('hostname', flat=True)) return random.choice(Instance.objects.filter(enabled=True).exclude(version__startswith='ansible-runner-').values_list('hostname', flat=True))
def is_lost(self, ref_time=None): def is_lost(self, ref_time=None):
@@ -158,9 +159,6 @@ class Instance(HasPolicyEditsMixin, BaseModel):
self.version = awx_application_version self.version = awx_application_version
self.save(update_fields=['capacity', 'version', 'modified', 'cpu', 'memory', 'cpu_capacity', 'mem_capacity']) self.save(update_fields=['capacity', 'version', 'modified', 'cpu', 'memory', 'cpu_capacity', 'mem_capacity'])
def is_receptor(self):
return self.version.startswith('ansible-runner-')
class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin): class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin):
"""A model representing a Queue/Group of AWX Instances.""" """A model representing a Queue/Group of AWX Instances."""
@@ -233,9 +231,7 @@ class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin):
def fit_task_to_most_remaining_capacity_instance(task, instances): def fit_task_to_most_remaining_capacity_instance(task, instances):
instance_most_capacity = None instance_most_capacity = None
for i in instances: for i in instances:
# TODO: change this to check if "execution" is in node_type field # TODO: continue if node is control-only node type
if not i.version.startswith('ansible-runner'):
continue
if i.remaining_capacity >= task.task_impact and ( if i.remaining_capacity >= task.task_impact and (
instance_most_capacity is None or i.remaining_capacity > instance_most_capacity.remaining_capacity instance_most_capacity is None or i.remaining_capacity > instance_most_capacity.remaining_capacity
): ):