From 18b1440d7c593551f3400f4b6203b4f46cbab5e5 Mon Sep 17 00:00:00 2001 From: Lucas Dias Date: Thu, 24 Mar 2022 17:59:43 +0100 Subject: [PATCH 1/2] fixed hardcode tmp ha.py --- awx/main/models/ha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py index a9dc9b887d..f7ed86cd7c 100644 --- a/awx/main/models/ha.py +++ b/awx/main/models/ha.py @@ -187,7 +187,7 @@ class Instance(HasPolicyEditsMixin, BaseModel): """ vargs = dict() if settings.AWX_CLEANUP_PATHS: - vargs['file_pattern'] = '/tmp/{}*'.format(JOB_FOLDER_PREFIX % '*') + vargs['file_pattern'] = '{}/{}*'.format(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)) From 01ce3440eb17a29fb73a562099eda3a3bb8a7901 Mon Sep 17 00:00:00 2001 From: Lucas Dias Date: Fri, 25 Mar 2022 14:26:00 +0100 Subject: [PATCH 2/2] added os.path and module import --- awx/main/models/ha.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py index f7ed86cd7c..5200f99d3e 100644 --- a/awx/main/models/ha.py +++ b/awx/main/models/ha.py @@ -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'] = '{}/{}*'.format(settings.AWX_ISOLATION_BASE_PATH, 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))