External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Provide new default pod defintion in CG metadata (#9181)

Browse Source
This commit is contained in:
Shane McDonald
2021-01-27 18:49:06 -05:00
parent 8f66793276
commit 86363e260e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/metadata.py
View File

@@ -24,7 +24,7 @@ from rest_framework.request import clone_request
from awx.api.fields import ChoiceNullField from awx.api.fields import ChoiceNullField
from awx.main.fields import JSONField, ImplicitRoleField from awx.main.fields import JSONField, ImplicitRoleField
from awx.main.models import NotificationTemplate from awx.main.models import NotificationTemplate
from awx.main.scheduler.kubernetes import PodManager from awx.main.tasks import AWXReceptorJob
class Metadata(metadata.SimpleMetadata): class Metadata(metadata.SimpleMetadata):
@@ -209,7 +209,7 @@ class Metadata(metadata.SimpleMetadata):
continue continue
if field == "pod_spec_override": if field == "pod_spec_override":
meta['default'] = PodManager().pod_definition meta['default'] = AWXReceptorJob().pod_definition
# Add type choices if available from the serializer. # Add type choices if available from the serializer.
if field == 'type' and hasattr(serializer, 'get_type_choices'): if field == 'type' and hasattr(serializer, 'get_type_choices'):

4
awx/main/tasks.py
View File

@@ -3029,12 +3029,12 @@ def deep_copy_model_obj(
class AWXReceptorJob: class AWXReceptorJob:
def __init__(self, task, runner_params): def __init__(self, task=None, runner_params=None):
self.task = task self.task = task
self.runner_params = runner_params self.runner_params = runner_params
self.unit_id = None 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) execution_environment_params = self.task.build_execution_environment_params(self.task.instance)
self.runner_params['settings'].update(execution_environment_params) self.runner_params['settings'].update(execution_environment_params)