Federation with OpenID Connect disables some default auth methods in Keystone

[Takashi Kajinami]

Description
===========

Originally reported in https://bugzilla.redhat.com/show_bug.cgi?id=1981269

When environments/enable-federation-openidc.yaml is included to use federation with OpenID Connect, keystone accepts the following auth methods
 - password
 - token
 - openid

However the list doesn't include some methods which are enabled by default and results in disabling some methods like application_credential.

Steps to reproduce
==================
- Deploy overcloud with OpenID Connect Federation enabled
- Check keystone.conf

Expected result
===============
- Defualt auth methods are kept enabled

Actual result
=============
- Some of the defualt auth methods like application_credential are disabled

Environment
===========
- The issue was initially found in stable/train, but the logic causing the issue still exists in master.

Logs & Configs
==============

[Takashi Kajinami (kajinamit)]

Fix proposed to master: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/800439/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/800439
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/62b17c21b8a8e392b14f48266c48c46f6100e24e
Submitter: "Zuul (22348)"
Branch: master

commit 62b17c21b8a8e392b14f48266c48c46f6100e24e
Author: Takashi Kajinami <email address hidden>
Date: Mon Jul 12 17:28:33 2021 +0900

    Keystone: Keep default auth methods in OpenIDC Federation

    The enable-federation-openidc.yaml environment file defines enabled
    auth methods but its current contents doesn't include all of
    the default items like application_credential.
    This change ensures that all default methods are still enabled when
    federation with OpenIDC is used.

    Closes-Bug: #1935811
    Change-Id: I7e168dda4419953abb1002b3180c8f512b59d7f1

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/wallaby
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/803284

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/803284
Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/943d15ea8c21f1935de280a4650dc45ce2b4063b
Submitter: "Zuul (22348)"
Branch: stable/wallaby

commit 943d15ea8c21f1935de280a4650dc45ce2b4063b
Author: Takashi Kajinami <email address hidden>
Date: Mon Jul 12 17:28:33 2021 +0900

    Keystone: Keep default auth methods in OpenIDC Federation

    The enable-federation-openidc.yaml environment file defines enabled
    auth methods but its current contents doesn't include all of
    the default items like application_credential.
    This change ensures that all default methods are still enabled when
    federation with OpenIDC is used.

    Closes-Bug: #1935811
    Change-Id: I7e168dda4419953abb1002b3180c8f512b59d7f1
    (cherry picked from commit 62b17c21b8a8e392b14f48266c48c46f6100e24e)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 15.1.0 release.