zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-15 07:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Prefer installer defaults over user-defined global EEs

Browse Source 
Add a basic level of testing around get_default_execution_environment
This commit is contained in:
Alan Rominger
2021-06-11 16:12:19 -04:00
parent 63aacd4e38
commit 92c6ddf13c
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/utils/execution_environments.py
+5
View File
@@ -13,6 +13,11 @@ def get_control_plane_execution_environment():
def get_default_execution_environment():
if settings.DEFAULT_EXECUTION_ENVIRONMENT is not None:
return settings.DEFAULT_EXECUTION_ENVIRONMENT
installed_default = ExecutionEnvironment.objects.filter(
image__in=[ee['image'] for ee in settings.GLOBAL_JOB_EXECUTION_ENVIRONMENTS], organization=None, managed_by_tower=False
).first()
if installed_default:
return installed_default
return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=False).first()