External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 13:39:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3121 from ryanpetrello/busted-isolated

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

Reviewed-by: Elijah DeLee <kdelee@redhat.com>
             https://github.com/kdelee
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-01-31 16:27:06 +00:00
committed by GitHub
parent d4ccb00338 10945faba1
commit 2b80f0f7b6
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: