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

Move default show paths to production.py

Browse Source 
This breaks the dev env
This commit is contained in:
Shane McDonald
2022-03-07 12:49:11 -05:00
parent a5b888c193
commit 9f021b780c
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tests/functional/api/test_settings.py
View File

@@ -38,10 +38,7 @@ def test_jobs_settings(get, put, patch, delete, admin):
data.pop('AWX_ANSIBLE_CALLBACK_PLUGINS') data.pop('AWX_ANSIBLE_CALLBACK_PLUGINS')
put(url, user=admin, data=data, expect=200) put(url, user=admin, data=data, expect=200)
response = get(url, user=admin, expect=200) response = get(url, user=admin, expect=200)
assert response.data['AWX_ISOLATION_SHOW_PATHS'] == [ assert response.data['AWX_ISOLATION_SHOW_PATHS'] == []
'/etc/pki/ca-trust:/etc/pki/ca-trust:O',
'/usr/share/pki:/usr/share/pki:O',
]
assert response.data['AWX_ANSIBLE_CALLBACK_PLUGINS'] == [] assert response.data['AWX_ANSIBLE_CALLBACK_PLUGINS'] == []

5
awx/settings/defaults.py
View File

@@ -589,10 +589,7 @@ GALAXY_IGNORE_CERTS = False
# Additional paths to show for jobs using process isolation. # Additional paths to show for jobs using process isolation.
# Note: This setting may be overridden by database settings. # Note: This setting may be overridden by database settings.
AWX_ISOLATION_SHOW_PATHS = [ AWX_ISOLATION_SHOW_PATHS = []
'/etc/pki/ca-trust:/etc/pki/ca-trust:O',
'/usr/share/pki:/usr/share/pki:O',
]
# The directory in which the service will create new temporary directories for job # The directory in which the service will create new temporary directories for job
# execution and isolation (such as credential files and custom # execution and isolation (such as credential files and custom

5
awx/settings/production.py
View File

@@ -91,3 +91,8 @@ except IOError:
DATABASES.setdefault('default', dict()).setdefault('OPTIONS', dict()).setdefault( DATABASES.setdefault('default', dict()).setdefault('OPTIONS', dict()).setdefault(
'application_name', f'{CLUSTER_HOST_ID}-{os.getpid()}-{" ".join(sys.argv)}'[:63] 'application_name', f'{CLUSTER_HOST_ID}-{os.getpid()}-{" ".join(sys.argv)}'[:63]
) # noqa ) # noqa
AWX_ISOLATION_SHOW_PATHS = [
'/etc/pki/ca-trust:/etc/pki/ca-trust:O',
'/usr/share/pki:/usr/share/pki:O',
]