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

properly detect ansible-playbook vs ansible runs in bwrap arg building

Browse Source 
a recent change (65641c7) made it so that we call
ansible-playbook using its _absolute path_ (i.e.,
/usr/bin/ansible-playbook, /var/lib/venv/xyz/bin/ansible-playbook), so
this logic is no longer correct
This commit is contained in:
Ryan Petrello
2019-01-31 11:03:27 -05:00
parent d4ccb00338
commit 10945faba1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/utils/common.py
View File

@@ -882,7 +882,7 @@ def wrap_args_with_proot(args, cwd, **kwargs):
path = os.path.realpath(path) path = os.path.realpath(path)
new_args.extend(['--bind', '%s' % (path,), '%s' % (path,)]) new_args.extend(['--bind', '%s' % (path,), '%s' % (path,)])
if kwargs.get('isolated'): if kwargs.get('isolated'):
if 'ansible-playbook' in args: if '/bin/ansible-playbook' in ' '.join(args):
# playbook runs should cwd to the SCM checkout dir # playbook runs should cwd to the SCM checkout dir
new_args.extend(['--chdir', os.path.join(kwargs['private_data_dir'], 'project')]) new_args.extend(['--chdir', os.path.join(kwargs['private_data_dir'], 'project')])
else: else: