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

Merge pull request #3500 from Spredzy/etc_ssh

Browse Source 
bwrap/runner: Add /etc/ssh in bind mounted folder

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

1
awx/main/tasks.py
View File

@ -818,6 +818,7 @@ class BaseTask(object):
'process_isolation_hide_paths': [ 'process_isolation_hide_paths': [
settings.AWX_PROOT_BASE_PATH, settings.AWX_PROOT_BASE_PATH,
'/etc/tower', '/etc/tower',
'/etc/ssh',
'/var/lib/awx', '/var/lib/awx',
'/var/log', '/var/log',
settings.PROJECTS_ROOT, settings.PROJECTS_ROOT,

3
awx/main/tests/unit/test_tasks.py
View File

@ -452,6 +452,7 @@ class TestGenericRun():
for p in [settings.AWX_PROOT_BASE_PATH, for p in [settings.AWX_PROOT_BASE_PATH,
'/etc/tower', '/etc/tower',
'/etc/ssh',
'/var/lib/awx', '/var/lib/awx',
'/var/log', '/var/log',
settings.PROJECTS_ROOT, settings.PROJECTS_ROOT,
@ -459,7 +460,7 @@ class TestGenericRun():
'/AWX_PROOT_HIDE_PATHS1', '/AWX_PROOT_HIDE_PATHS1',
'/AWX_PROOT_HIDE_PATHS2']: '/AWX_PROOT_HIDE_PATHS2']:
assert p in process_isolation_params['process_isolation_hide_paths'] assert p in process_isolation_params['process_isolation_hide_paths']
assert 8 == len(process_isolation_params['process_isolation_hide_paths']) assert 9 == len(process_isolation_params['process_isolation_hide_paths'])
assert '/ANSIBLE_VENV_PATH' in process_isolation_params['process_isolation_ro_paths'] assert '/ANSIBLE_VENV_PATH' in process_isolation_params['process_isolation_ro_paths']
assert '/AWX_VENV_PATH' in process_isolation_params['process_isolation_ro_paths'] assert '/AWX_VENV_PATH' in process_isolation_params['process_isolation_ro_paths']
assert 2 == len(process_isolation_params['process_isolation_ro_paths']) assert 2 == len(process_isolation_params['process_isolation_ro_paths'])