From 10945faba1c08cd0c04d5a09386dcedf3e164f51 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 31 Jan 2019 11:03:27 -0500 Subject: [PATCH] properly detect ansible-playbook vs ansible runs in bwrap arg building 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 --- awx/main/utils/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index a45c12eb50..4e2fb23638 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -882,7 +882,7 @@ def wrap_args_with_proot(args, cwd, **kwargs): path = os.path.realpath(path) new_args.extend(['--bind', '%s' % (path,), '%s' % (path,)]) 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 new_args.extend(['--chdir', os.path.join(kwargs['private_data_dir'], 'project')]) else: