From 8fe72cfe5dba5acd10e1b40fb34366a347d9cbed Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Fri, 29 Nov 2024 12:39:12 +0100 Subject: [PATCH] Fix wsgi service name for the federation tests 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 --- devstack/lib/federation.sh | 2 +- devstack/lib/oidc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/lib/federation.sh b/devstack/lib/federation.sh index aeeee54201..34bfb9d2e9 100644 --- a/devstack/lib/federation.sh +++ b/devstack/lib/federation.sh @@ -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 diff --git a/devstack/lib/oidc.sh b/devstack/lib/oidc.sh index ab8731d986..218a937b6d 100644 --- a/devstack/lib/oidc.sh +++ b/devstack/lib/oidc.sh @@ -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;