External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7811 from ryanpetrello/deprecate-galaxy-basic-auth

Browse Source 
mark PRIMARY_GALAXY_USERNAME and PRIMARY_GALAXY_PASSWORD as deprecated

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-08-04 14:45:58 +00:00
committed by GitHub
parent 15c4ab3a9b 76ba363513
commit b990271dec
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/conf.py
View File

@@ -458,7 +458,8 @@ register(
required=False, required=False,
allow_blank=True, allow_blank=True,
label=_('Primary Galaxy Server Username'), label=_('Primary Galaxy Server Username'),
help_text=_('For using a galaxy server at higher precedence than the public Ansible Galaxy. ' help_text=_('(This setting is deprecated and will be removed in a future release) '
'For using a galaxy server at higher precedence than the public Ansible Galaxy. '
'The username to use for basic authentication against the Galaxy instance, ' 'The username to use for basic authentication against the Galaxy instance, '
'this is mutually exclusive with PRIMARY_GALAXY_TOKEN.'), 'this is mutually exclusive with PRIMARY_GALAXY_TOKEN.'),
category=_('Jobs'), category=_('Jobs'),
@@ -472,7 +473,8 @@ register(
required=False, required=False,
allow_blank=True, allow_blank=True,
label=_('Primary Galaxy Server Password'), label=_('Primary Galaxy Server Password'),
help_text=_('For using a galaxy server at higher precedence than the public Ansible Galaxy. ' help_text=_('(This setting is deprecated and will be removed in a future release) '
'For using a galaxy server at higher precedence than the public Ansible Galaxy. '
'The password to use for basic authentication against the Galaxy instance, ' 'The password to use for basic authentication against the Galaxy instance, '
'this is mutually exclusive with PRIMARY_GALAXY_TOKEN.'), 'this is mutually exclusive with PRIMARY_GALAXY_TOKEN.'),
category=_('Jobs'), category=_('Jobs'),