External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 15:36:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11957 from lucas-benedito/fix_hardcode_tmp_models_ha

Browse Source 
fixed hardcode tmp ha.py
This commit is contained in:
Shane McDonald
2022-03-25 09:57:02 -04:00
committed by GitHub
parent b6573ec2e2 8af2214979
commit e4c85a5790
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/ha.py
View File

@@ -4,6 +4,7 @@
from decimal import Decimal from decimal import Decimal
import random import random
import logging import logging
import os
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.db import models, connection from django.db import models, connection
@@ -187,7 +188,7 @@ class Instance(HasPolicyEditsMixin, BaseModel):
""" """
vargs = dict() vargs = dict()
if settings.AWX_CLEANUP_PATHS: if settings.AWX_CLEANUP_PATHS:
vargs['file_pattern'] = '/tmp/{}*'.format(JOB_FOLDER_PREFIX % '*') vargs['file_pattern'] = os.path.join(settings.AWX_ISOLATION_BASE_PATH, JOB_FOLDER_PREFIX % '*') + '*'
vargs.update(kwargs) vargs.update(kwargs)
if 'exclude_strings' not in vargs and vargs.get('file_pattern'): if 'exclude_strings' not in vargs and vargs.get('file_pattern'):
active_pks = list(UnifiedJob.objects.filter(execution_node=self.hostname, status__in=('running', 'waiting')).values_list('pk', flat=True)) active_pks = list(UnifiedJob.objects.filter(execution_node=self.hostname, status__in=('running', 'waiting')).values_list('pk', flat=True))