External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 21:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11968 from AlanCoding/cleanup_tweaks

Browse Source 
Minor tweaks to ansible-runner cleanup task arguments
This commit is contained in:
Alan Rominger
2022-03-29 15:00:33 -04:00
committed by GitHub
parent e2135b8d68 f17ceca7a0
commit 3d22c8ae91
3 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,8 +191,14 @@ class Instance(HasPolicyEditsMixin, BaseModel):
if settings.AWX_CLEANUP_PATHS:
vargs['file_pattern'] = os.path.join(settings.AWX_ISOLATION_BASE_PATH, JOB_FOLDER_PREFIX % '*') + '*'
vargs.update(kwargs)
if not isinstance(vargs.get('grace_period'), int):
vargs['grace_period'] = 60 # grace period of 60 minutes, need to set because CLI default will not take effect
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(
(models.Q(execution_node=self.hostname) | models.Q(controller_node=self.hostname)) & models.Q(status__in=('running', 'waiting'))
).values_list('pk', flat=True)
)
if active_pks:
vargs['exclude_strings'] = [JOB_FOLDER_PREFIX % job_id for job_id in active_pks]
if 'remove_images' in vargs or 'image_prune' in vargs: