diff --git a/awx/main/isolated/manager.py b/awx/main/isolated/manager.py index 5a51e898e0..2cafa97f36 100644 --- a/awx/main/isolated/manager.py +++ b/awx/main/isolated/manager.py @@ -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 diff --git a/awx/plugins/isolated/awx_isolated_cleanup.py b/awx/plugins/isolated/awx_isolated_cleanup.py index bfc5e8c19e..b2f3926bcb 100644 --- a/awx/plugins/isolated/awx_isolated_cleanup.py +++ b/awx/plugins/isolated/awx_isolated_cleanup.py @@ -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 diff --git a/tools/docker-isolated/README.md b/tools/docker-isolated/README.md index 1bed743c61..6a09d59bb4 100644 --- a/tools/docker-isolated/README.md +++ b/tools/docker-isolated/README.md @@ -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`.