External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3723 from ryanpetrello/django-works-in-mysterious-ways

Browse Source 
fix a bug that breaks the isolated heartbeat

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-04-16 20:46:14 +00:00
committed by GitHub
parent 15ef095366 f1d87bf392
commit 7f5227809f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/isolated/manager.py
View File

@@ -316,8 +316,10 @@ class IsolatedManager(object):
- clean up orphaned private files - clean up orphaned private files
Performs save on each instance to update its capacity. Performs save on each instance to update its capacity.
''' '''
instance_qs = [i for i in instance_qs if i.enabled]
if not len(instance_qs):
return
try: try:
instance_qs = instance_qs.filter(enabled=True)
private_data_dir = tempfile.mkdtemp( private_data_dir = tempfile.mkdtemp(
prefix='awx_iso_heartbeat_', prefix='awx_iso_heartbeat_',
dir=settings.AWX_PROOT_BASE_PATH dir=settings.AWX_PROOT_BASE_PATH
@@ -326,7 +328,7 @@ class IsolatedManager(object):
instance.hostname for instance in instance_qs instance.hostname for instance in instance_qs
]) ])
self.runner_params['private_data_dir'] = private_data_dir self.runner_params['private_data_dir'] = private_data_dir
self.runner_params['forks'] = str(len(instance_qs)) self.runner_params['forks'] = len(instance_qs)
runner_obj = self.run_management_playbook( runner_obj = self.run_management_playbook(
'heartbeat_isolated.yml', 'heartbeat_isolated.yml',
private_data_dir private_data_dir