This ticket is to track the backporting of the following keystone changes that should fix the issues Heat is having with enforce_scope being enabled:

https://review.opendev.org/c/openstack/keystone/+/914759

https://review.opendev.org/c/openstack/keystone/+/916130/2

Once these are merged we will be able to merge the revert here:

https://github.com/openstack-k8s-operators/keystone-operator/pull/415