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

Only turn off Galaxy cert verification via toggle (#3933)

Browse Source
This commit is contained in:
Alan Rominger 2019-10-31 22:56:48 -04:00 committed by Ryan Petrello
parent c7cabfa785
commit 8e7d607a47
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/conf.py
View File

@ -514,6 +514,17 @@ register(
category_slug='jobs' category_slug='jobs'
) )
register(
'GALAXY_IGNORE_CERTS',
field_class=fields.BooleanField,
default=False,
label=_('Ignore Ansible Galaxy SSL Certificate Verification'),
help_text=_('If set to true, certificate validation will not be done when'
'installing content from any Galaxy server.'),
category=_('Jobs'),
category_slug='jobs'
)
register( register(
'STDOUT_MAX_BYTES_DISPLAY', 'STDOUT_MAX_BYTES_DISPLAY',
field_class=fields.IntegerField, field_class=fields.IntegerField,

1
awx/main/tasks.py
View File

@ -1938,6 +1938,7 @@ class RunProjectUpdate(BaseTask):
env['TMP'] = settings.AWX_PROOT_BASE_PATH env['TMP'] = settings.AWX_PROOT_BASE_PATH
env['PROJECT_UPDATE_ID'] = str(project_update.pk) env['PROJECT_UPDATE_ID'] = str(project_update.pk)
env['ANSIBLE_CALLBACK_PLUGINS'] = self.get_path_to('..', 'plugins', 'callback') env['ANSIBLE_CALLBACK_PLUGINS'] = self.get_path_to('..', 'plugins', 'callback')
if settings.GALAXY_IGNORE_CERTS:
env['ANSIBLE_GALAXY_IGNORE'] = True env['ANSIBLE_GALAXY_IGNORE'] = True
# Set up the public Galaxy server, if enabled # Set up the public Galaxy server, if enabled
if settings.PUBLIC_GALAXY_ENABLED: if settings.PUBLIC_GALAXY_ENABLED:

3
awx/settings/defaults.py
View File

@ -605,6 +605,9 @@ PUBLIC_GALAXY_SERVER = {
'url': 'https://galaxy.ansible.com' 'url': 'https://galaxy.ansible.com'
} }
# Applies to any galaxy server
GALAXY_IGNORE_CERTS = False
# List of dicts of fallback (additional) Galaxy servers. If configured, these # List of dicts of fallback (additional) Galaxy servers. If configured, these
# will be higher precedence than public Galaxy, but lower than primary Galaxy. # will be higher precedence than public Galaxy, but lower than primary Galaxy.
# Available options: 'id', 'url', 'username', 'password', 'token', 'auth_url' # Available options: 'id', 'url', 'username', 'password', 'token', 'auth_url'