From 86363e260e756313ce95af00d5f250b80f4cec8d Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 27 Jan 2021 18:49:06 -0500 Subject: [PATCH] Provide new default pod defintion in CG metadata (#9181) --- awx/api/metadata.py | 4 ++-- awx/main/tasks.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/api/metadata.py b/awx/api/metadata.py index 0b60f9a1ef..dedeeba8fb 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.scheduler.kubernetes import PodManager +from awx.main.tasks import AWXReceptorJob class Metadata(metadata.SimpleMetadata): @@ -209,7 +209,7 @@ class Metadata(metadata.SimpleMetadata): continue if field == "pod_spec_override": - meta['default'] = PodManager().pod_definition + meta['default'] = AWXReceptorJob().pod_definition # 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 db6b8644cd..ef0bd7e6e5 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -3029,12 +3029,12 @@ def deep_copy_model_obj( class AWXReceptorJob: - def __init__(self, task, runner_params): + def __init__(self, task=None, runner_params=None): self.task = task self.runner_params = runner_params self.unit_id = None - if not self.task.instance.is_container_group_task: + if self.task and not self.task.instance.is_container_group_task: execution_environment_params = self.task.build_execution_environment_params(self.task.instance) self.runner_params['settings'].update(execution_environment_params)