openstack/keystone
Code Issues Proposed changes

Fix wsgi service name for the federation tests

Browse Source 
in devstack the service name was set explicitly to keystone-api as what
we have used for the new wsgi module. By default when unset devstack was
defaulting to the basename of the wsgi script (keystone-wsgi-public).
That file is created by federation tests but is not enabled in devstack.
Fix that.

Change-Id: Ie1b0e1e68441785e3b00543de75575c49917f591
This commit is contained in:
Artem Goncharov 2024-11-29 12:39:12 +01:00
parent 516a341b90
commit 8fe72cfe5d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/federation.sh
View File

@ -37,7 +37,7 @@ ATTRIBUTE_MAP="/etc/shibboleth/attribute-map.xml"
function configure_apache {
if [[ "$WSGI_MODE" == "uwsgi" ]]; then
local keystone_apache_conf=$(apache_site_config_for keystone-wsgi-public)
local keystone_apache_conf=$(apache_site_config_for keystone-api)
echo "ProxyPass /Shibboleth.sso !" | sudo tee -a $keystone_apache_conf

2
devstack/lib/oidc.sh
View File

@ -89,7 +89,7 @@ function configure_federation {
python3 $OIDC_PLUGIN/tools/oidc/setup_keycloak_client.py
fi
local keystone_apache_conf=$(apache_site_config_for keystone-wsgi-public)
local keystone_apache_conf=$(apache_site_config_for keystone-api)
cat $OIDC_PLUGIN/files/oidc/apache_oidc.conf | sudo tee -a $keystone_apache_conf
sudo sed -i -e "
s|%OIDC_CLIENT_ID%|$OIDC_CLIENT_ID|g;