From 373cd9c20b9f307de9ad88dd51d1e8f2d2a851fd Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 9 Jun 2021 12:41:24 -0400 Subject: [PATCH] Remove usage of AWXReceptorJob in metadata.py --- awx/api/metadata.py | 4 ++-- awx/main/tasks.py | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/awx/api/metadata.py b/awx/api/metadata.py index ced1f3032d..5b8cf2ccb3 100644 --- a/awx/api/metadata.py +++ b/awx/api/metadata.py @@ -24,7 +24,7 @@ from rest_framework.request import clone_request from awx.api.fields import ChoiceNullField from awx.main.fields import JSONField, ImplicitRoleField from awx.main.models import NotificationTemplate -from awx.main.tasks import AWXReceptorJob +from awx.main.utils.execution_environments import get_default_pod_spec # Polymorphic from polymorphic.models import PolymorphicModel @@ -211,7 +211,7 @@ class Metadata(metadata.SimpleMetadata): continue if field == "pod_spec_override": - meta['default'] = AWXReceptorJob().pod_definition + meta['default'] = get_default_pod_spec() # Add type choices if available from the serializer. if field == 'type' and hasattr(serializer, 'get_type_choices'): diff --git a/awx/main/tasks.py b/awx/main/tasks.py index b1e41fbe52..0a06abab49 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -2879,7 +2879,7 @@ class TransmitterThread(threading.Thread): class AWXReceptorJob: - def __init__(self, task=None, runner_params=None): + def __init__(self, task, runner_params=None): self.task = task self.runner_params = runner_params self.unit_id = None @@ -3034,10 +3034,7 @@ class AWXReceptorJob: @property def pod_definition(self): - if self.task and self.task.instance.execution_environment: - ee = self.task.instance.execution_environment - else: - ee = get_default_execution_environment() + ee = self.task.instance.execution_environment default_pod_spec = get_default_pod_spec()