diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst index bac071e116..6a2dac6e9f 100644 --- a/doc/source/configuration/settings.rst +++ b/doc/source/configuration/settings.rst @@ -1696,7 +1696,17 @@ WEBSSO_CHOICES .. versionadded:: 2015.1(Kilo) -Default: ``()`` +.. versionchanged:: 2026.1(Gazpacho) + + The default value has been updated to include the credentials mechanism. + +Default: + +.. code-block:: python + + ( + ("credentials", _("Keystone Credentials")), + ) This is the list of authentication mechanisms available to the user. It includes Keystone federation protocols such as OpenID Connect and SAML, and diff --git a/openstack_auth/defaults.py b/openstack_auth/defaults.py index 41cfe539e6..7ef5e49c75 100644 --- a/openstack_auth/defaults.py +++ b/openstack_auth/defaults.py @@ -10,6 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. +from django.utils.translation import gettext_lazy as _ + # NOTE: The following are from Django settings. # LOGIN_URL # LOGIN_REDIRECT_URL @@ -119,7 +121,9 @@ WEBSSO_INITIAL_CHOICE = 'credentials' # ("acme_oidc", "ACME - OpenID Connect"), # ("acme_saml2", "ACME - SAML2"), # ) -WEBSSO_CHOICES = () +WEBSSO_CHOICES = ( + ("credentials", _("Keystone Credentials")), +) # A dictionary of specific identity provider and federation protocol # combinations. From the selected authentication mechanism, the value diff --git a/releasenotes/notes/add-credentials-to-default-websso-choices-fb25b7ce50d81e04.yaml b/releasenotes/notes/add-credentials-to-default-websso-choices-fb25b7ce50d81e04.yaml new file mode 100644 index 0000000000..3abddb47c6 --- /dev/null +++ b/releasenotes/notes/add-credentials-to-default-websso-choices-fb25b7ce50d81e04.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Now the ``WEBSSO_CHOICES`` option includes the entry to use credentials + mechanism by default.