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

Update the EE resolver logic

Browse Source 
so that the control plane managed EE is kept separate.
This commit is contained in:
Jeff Bradberry
2021-06-07 15:55:15 -04:00
parent d4d21a1511
commit 9aa56b1247
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/utils/execution_environments.py
+5 -1
View File
@@ -6,10 +6,14 @@ from django.conf import settings
from awx.main.models.execution_environments import ExecutionEnvironment
def get_control_plane_execution_environment():
return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=True).first()
def get_default_execution_environment():
if settings.DEFAULT_EXECUTION_ENVIRONMENT is not None:
return settings.DEFAULT_EXECUTION_ENVIRONMENT
return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=True).first()
return ExecutionEnvironment.objects.filter(organization=None, managed_by_tower=False).first()
def get_default_pod_spec():