diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index e97307bb48..d60c2ea46c 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -6,7 +6,7 @@ import platform import distro from django.db import connection -from django.db.models import Count, Max, Min +from django.db.models import Count from django.conf import settings from django.contrib.sessions.models import Session from django.utils.timezone import now, timedelta diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index 65dffc457c..6854ebd4bc 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -253,10 +253,9 @@ class TaskManager: } dependencies = [{'type': get_type_for_model(type(t)), 'id': t.id} for t in dependent_tasks] - controller_node = None if task.supports_isolation() and rampart_group.controller_id: try: - controller_node = rampart_group.choose_online_controller_node() + rampart_group.choose_online_controller_node() except IndexError: logger.debug("No controllers available in group {} to run {}".format(rampart_group.name, task.log_format)) return