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

Fix container group OPTIONS request

Browse Source
This commit is contained in:
Shane McDonald
2021-03-29 13:26:59 -04:00
parent 91351f7e3b
commit 3d533e5661
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -97,6 +97,7 @@ from awx.main.utils import (
deepmerge, deepmerge,
parse_yaml_or_json, parse_yaml_or_json,
) )
from awx.main.utils.execution_environments import get_execution_environment_default
from awx.main.utils.ansible import read_ansible_config from awx.main.utils.ansible import read_ansible_config
from awx.main.utils.external_logging import reconfigure_rsyslog from awx.main.utils.external_logging import reconfigure_rsyslog
from awx.main.utils.safe_yaml import safe_dump, sanitize_jinja from awx.main.utils.safe_yaml import safe_dump, sanitize_jinja
@@ -3126,7 +3127,10 @@ class AWXReceptorJob:
@property @property
def pod_definition(self): def pod_definition(self):
ee = self.task.instance.resolve_execution_environment() if self.task:
ee = self.task.instance.resolve_execution_environment()
else:
ee = get_execution_environment_default()
default_pod_spec = { default_pod_spec = {
"apiVersion": "v1", "apiVersion": "v1",