shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

store cloudforms inventory cache files in the proper location on disk

Browse Source 
with process isolation enabled (which is the awx default), cloudforms
caches inventory script results on disk; awx should direct cloudforms to
store these cache files in a location that's exposed to the isolated
environment

see: ansible/ansible#31760
This commit is contained in:
Ryan Petrello 2017-10-17 17:06:48 -04:00
parent 3d12e040ed
commit 5895654538
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tasks.py
View File

@ -1794,6 +1794,11 @@ class RunInventoryUpdate(BaseTask):
section = 'cache' section = 'cache'
cp.add_section(section) cp.add_section(section)
cp.set(section, 'max_age', "0") cp.set(section, 'max_age', "0")
cache_path = tempfile.mkdtemp(
prefix='cloudforms_cache',
dir=kwargs.get('private_data_dir', None)
)
cp.set(section, 'path', cache_path)
elif inventory_update.source == 'azure_rm': elif inventory_update.source == 'azure_rm':
section = 'azure' section = 'azure'

4
awx/main/tests/unit/test_tasks.py
View File

@ -1473,6 +1473,10 @@ class TestInventoryUpdateCredentials(TestJobExecution):
assert config.get('cloudforms', 'username') == 'bob' assert config.get('cloudforms', 'username') == 'bob'
assert config.get('cloudforms', 'password') == 'secret' assert config.get('cloudforms', 'password') == 'secret'
assert config.get('cloudforms', 'ssl_verify') == 'false' assert config.get('cloudforms', 'ssl_verify') == 'false'
cache_path = config.get('cache', 'path')
assert cache_path.startswith(env['AWX_PRIVATE_DATA_DIR'])
assert os.path.isdir(cache_path)
return ['successful', 0] return ['successful', 0]
self.run_pexpect.side_effect = run_pexpect_side_effect self.run_pexpect.side_effect = run_pexpect_side_effect