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

Update pod reaper to work with receptor launched pods

Browse Source
This commit is contained in:
Shane McDonald
2021-04-05 17:45:15 -04:00
parent 6294ddfded
commit 2d48b24ef2
6 changed files with 52 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/mixins.py
View File

@@ -21,7 +21,7 @@ from django.utils.translation import ugettext_lazy as _
from awx.main.models.base import prevent_search
from awx.main.models.rbac import Role, RoleAncestorEntry, get_roles_on_resource
from awx.main.utils import parse_yaml_or_json, get_custom_venv_choices, get_licenser, polymorphic
from awx.main.utils.execution_environments import get_execution_environment_default
from awx.main.utils.execution_environments import get_default_execution_environment
from awx.main.utils.encryption import decrypt_value, get_encryption_key, is_encrypted
from awx.main.utils.polymorphic import build_polymorphic_ctypes_map
from awx.main.fields import JSONField, AskForField
@@ -476,7 +476,7 @@ class ExecutionEnvironmentMixin(models.Model):
if self.inventory.organization.default_environment is not None:
return self.inventory.organization.default_environment
return get_execution_environment_default()
return get_default_execution_environment()
class CustomVirtualEnvMixin(models.Model):

2
awx/main/models/projects.py
View File

@@ -184,7 +184,7 @@ class ProjectOptions(models.Model):
Jobs using the project can use the default_environment, but the project updates
are not flexible enough to allow customizing the image they use.
"""
return self.get_execution_environment_default()
return self.get_default_execution_environment()
def get_project_path(self, check_if_exists=True):
local_path = os.path.basename(self.local_path)