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

Merge pull request #495 from ryanpetrello/fix-7713

Browse Source 
work around an ansible 2.4 inventory caching bug
This commit is contained in:
Ryan Petrello 2017-10-03 16:26:41 -04:00 committed by GitHub
commit e48bebb761
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/tasks.py
View File

@ -702,7 +702,12 @@ class BaseTask(LogErrorsTask):
os.chmod(path, stat.S_IRUSR | stat.S_IXUSR) os.chmod(path, stat.S_IRUSR | stat.S_IXUSR)
return path return path
else: else:
return plugin # work around an inventory caching bug in Ansible 2.4.0
# see: https://github.com/ansible/ansible/pull/30817
# see: https://github.com/ansible/awx/issues/246
inventory_script = tempfile.mktemp(suffix='.awxrest.py', dir=kwargs['private_data_dir'])
shutil.copy(plugin, inventory_script)
return inventory_script
def build_args(self, instance, **kwargs): def build_args(self, instance, **kwargs):
raise NotImplementedError raise NotImplementedError

7
awx/main/tests/unit/models/test_survey_models.py
View File

@ -1,3 +1,4 @@
import tempfile
import pytest import pytest
import json import json
@ -62,7 +63,7 @@ def test_survey_passwords_not_in_extra_vars():
def test_job_safe_args_redacted_passwords(job): def test_job_safe_args_redacted_passwords(job):
"""Verify that safe_args hides passwords in the job extra_vars""" """Verify that safe_args hides passwords in the job extra_vars"""
kwargs = {'ansible_version': '2.1'} kwargs = {'ansible_version': '2.1', 'private_data_dir': tempfile.mkdtemp()}
run_job = RunJob() run_job = RunJob()
safe_args = run_job.build_safe_args(job, **kwargs) safe_args = run_job.build_safe_args(job, **kwargs)
ev_index = safe_args.index('-e') + 1 ev_index = safe_args.index('-e') + 1
@ -70,8 +71,8 @@ def test_job_safe_args_redacted_passwords(job):
assert extra_vars['secret_key'] == '$encrypted$' assert extra_vars['secret_key'] == '$encrypted$'
def test_job_args_unredacted_passwords(job): def test_job_args_unredacted_passwords(job, tmpdir_factory):
kwargs = {'ansible_version': '2.1'} kwargs = {'ansible_version': '2.1', 'private_data_dir': tempfile.mkdtemp()}
run_job = RunJob() run_job = RunJob()
args = run_job.build_args(job, **kwargs) args = run_job.build_args(job, **kwargs)
ev_index = args.index('-e') + 1 ev_index = args.index('-e') + 1