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

mark PRIMARY_GALAXY_USERNAME and PRIMARY_GALAXY_PASSWORD as deprecated Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
ansible · Aug 4, 2020 · b990271 · b990271
2 parents 15c4ab3 + 76ba363
commit b990271
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/awx/main/conf.py b/awx/main/conf.py
@@ -458,7 +458,8 @@ def _load_default_license_from_file():
     required=False,
     allow_blank=True,
     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, '
                 'this is mutually exclusive with PRIMARY_GALAXY_TOKEN.'),
     category=_('Jobs'),
@@ -472,7 +473,8 @@ def _load_default_license_from_file():
     required=False,
     allow_blank=True,
     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, '
                 'this is mutually exclusive with PRIMARY_GALAXY_TOKEN.'),
     category=_('Jobs'),