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

Merge pull request #34 from ryanpetrello/release_3.2.0

Browse Source 
more tower -> awx for task execution and isolated tooling
This commit is contained in:
Ryan Petrello
2017-07-25 11:16:04 -04:00
committed by GitHub
parent bd02dd4f1d e29492a259
commit 373240135c
11 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -472,7 +472,7 @@ class BaseTask(Task):
'''
Create a temporary directory for job-related files.
'''
path = tempfile.mkdtemp(prefix='ansible_tower_%s_' % instance.pk, dir=settings.AWX_PROOT_BASE_PATH)
path = tempfile.mkdtemp(prefix='ansible_awx_%s_' % instance.pk, dir=settings.AWX_PROOT_BASE_PATH)
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
self.cleanup_paths.append(path)
return path
@@ -1857,7 +1857,7 @@ class RunInventoryUpdate(BaseTask):
elif src == 'scm':
args.append(inventory_update.get_actual_source_path())
elif src == 'custom':
runpath = tempfile.mkdtemp(prefix='ansible_tower_inventory_', dir=settings.AWX_PROOT_BASE_PATH)
runpath = tempfile.mkdtemp(prefix='ansible_awx_inventory_', dir=settings.AWX_PROOT_BASE_PATH)
handle, path = tempfile.mkstemp(dir=runpath)
f = os.fdopen(handle, 'w')
if inventory_update.source_script is None: