External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 03:10:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3624 from ryanpetrello/iso-cleanup-path-changes

Browse Source 
update periodic isolated cleanup to match the new paths post-runner

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-04-05 14:25:18 +00:00 committed by GitHub
commit d4c69429db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,7 +340,7 @@ class IsolatedManager(object):
:param instance: a `model.Job` instance
:param private_data_dir: an absolute path on the local file system
where job-specific data should be written
(i.e., `/tmp/ansible_awx_xyz/`)
(i.e., `/tmp/awx_N_xyz/`)
:param playbook: the playbook to run
:param module: the module to run
:param module_args: the module args to use

4
awx/plugins/isolated/awx_isolated_cleanup.py
View File

@ -39,7 +39,7 @@ def main():
job_cutoff = datetime.datetime.now() - datetime.timedelta(hours=1)
for search_pattern in [
'/tmp/ansible_awx_[0-9]*_*', '/tmp/ansible_awx_proot_*',
'/tmp/awx_[0-9]*_*', '/tmp/ansible_runner_pi_*',
]:
for path in glob.iglob(search_pattern):
st = os.stat(path)
@ -49,7 +49,7 @@ def main():
continue
elif modtime > folder_cutoff:
try:
re_match = re.match(r'\/tmp\/ansible_awx_\d+_.+', path)
re_match = re.match(r'\/tmp\/awx_\d+_.+', path)
if re_match is not None:
if subprocess.check_call(['ansible-runner', 'is-alive', path]) == 0:
continue

4
tools/docker-isolated/README.md
View File

@ -56,12 +56,12 @@ by disabling some parts of the cleanup_isolated.yml playbook.
Example location of a private data directory:
`/tmp/ansible_awx_29_OM6Mnx/`
`/tmp/awx_29_OM6Mnx/`
The following command would run the playbook corresponding to that job.
```bash
ansible-runner start /tmp/ansible_awx_29_OM6Mnx/ -p some_playbook.yml
ansible-runner start /tmp/awx_29_OM6Mnx/ -p some_playbook.yml
```
Other ansible-runner commands include `start`, `is-alive`, and `stop`.