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

Merge pull request #10062 from shanemcd/fix-ee-cg

Browse Source 
A couple EE bug fixes

See commit messages for more info

Reviewed-by: Seth Foster <None>
Reviewed-by: Alan Rominger <arominge@redhat.com>
Reviewed-by: Christian Adams <rooftopcellist@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-04-30 17:10:23 +00:00
committed by GitHub
parent 43d33281a5 f94db36273
commit e0d6b138b0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -3038,13 +3038,15 @@ class AWXReceptorJob:
ee = get_default_execution_environment() ee = get_default_execution_environment()
default_pod_spec = get_default_pod_spec() default_pod_spec = get_default_pod_spec()
default_pod_spec['spec']['containers'][0]['image'] = ee.image
pod_spec_override = {} pod_spec_override = {}
if self.task and self.task.instance.instance_group.pod_spec_override: if self.task and self.task.instance.instance_group.pod_spec_override:
pod_spec_override = parse_yaml_or_json(self.task.instance.instance_group.pod_spec_override) pod_spec_override = parse_yaml_or_json(self.task.instance.instance_group.pod_spec_override)
pod_spec = {**default_pod_spec, **pod_spec_override} pod_spec = {**default_pod_spec, **pod_spec_override}
pod_spec['spec']['containers'][0]['image'] = ee.image
pod_spec['spec']['containers'][0]['args'] = ['ansible-runner', 'worker', '--private-data-dir=/runner']
if self.task: if self.task:
pod_spec['metadata'] = deepmerge( pod_spec['metadata'] = deepmerge(
pod_spec.get('metadata', {}), pod_spec.get('metadata', {}),

1
awx/main/utils/execution_environments.py
View File

@@ -20,6 +20,7 @@ def get_default_pod_spec():
{ {
"image": get_default_execution_environment().image, "image": get_default_execution_environment().image,
"name": 'worker', "name": 'worker',
"args": ['ansible-runner', 'worker', '--private-data-dir=/runner'],
} }
], ],
}, },