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

Merge pull request #3140 from AlanCoding/isolate_venv

Browse Source 
Use custom venv in inventory proot-ing

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-02-02 12:17:25 +00:00 committed by GitHub
commit e23fb31a4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/management/commands/inventory_import.py
View File

@ -141,6 +141,9 @@ class AnsibleInventoryLoader(object):
kwargs['proot_show_paths'] = [functioning_dir(self.source)] kwargs['proot_show_paths'] = [functioning_dir(self.source)]
logger.debug("Running from `{}` working directory.".format(cwd)) logger.debug("Running from `{}` working directory.".format(cwd))
if self.venv_path != settings.ANSIBLE_VENV_PATH:
kwargs['proot_custom_virtualenv'] = self.venv_path
return wrap_args_with_proot(cmd, cwd, **kwargs) return wrap_args_with_proot(cmd, cwd, **kwargs)
def command_to_json(self, cmd): def command_to_json(self, cmd):