Merge pull request #11957 from lucas-benedito/fix_hardcode_tmp_models_ha

fixed hardcode tmp ha.py
This commit is contained in:
Shane McDonald 2022-03-25 09:57:02 -04:00 committed by GitHub
commit e4c85a5790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,6 +4,7 @@
from decimal import Decimal
import random
import logging
import os
from django.core.validators import MinValueValidator
from django.db import models, connection
@ -187,7 +188,7 @@ class Instance(HasPolicyEditsMixin, BaseModel):
"""
vargs = dict()
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)
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))