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

Merge pull request #534 from ryanpetrello/release_3.2.2

Browse Source 
store cloudforms inventory cache files in the proper location on disk
This commit is contained in:
Ryan Petrello 2017-10-20 09:41:05 -04:00 committed by GitHub
commit 88acd95a72
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'
cp.add_section(section)
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':
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', 'password') == 'secret'
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]
self.run_pexpect.side_effect = run_pexpect_side_effect