From f055bbb5e92919ed2912c5fd40598ef30aedaeb7 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 5 Nov 2021 14:46:57 +0100 Subject: [PATCH] CI: Fix breakage following devstack changes A recent devstack change [1] has dropped all KEYSTONE_AUTH_* variables except KEYSTONE_AUTH_URI. Use KEYSTONE_SERVICE_* variables instead. Another change [2] switched off the creation of an admin endpoint for keystone, which we need. Create it again until we update Blazar to stop using it. The devstack plugin was creating a keystonev3 service with endpoints using port 5000. However, we have been using the main keystone service on port 80 since commit 2d0cabb17d9a609a62bcffb13175e34b1c1cc1f0. Update service name/type and endpoint URLs accordingly. [1] https://review.opendev.org/c/openstack/devstack/+/735472 [2] https://review.opendev.org/c/openstack/devstack/+/777345 Change-Id: I5fdd5e6095e579e2584984870932284afd7cb934 --- devstack/plugin.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 977e2aba..601c44a5 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -31,7 +31,7 @@ function configure_blazar { touch $BLAZAR_CONF_FILE iniset $BLAZAR_CONF_FILE DEFAULT os_auth_version v3 - iniset $BLAZAR_CONF_FILE DEFAULT os_auth_host $(ipv6_unquote $KEYSTONE_AUTH_HOST) + iniset $BLAZAR_CONF_FILE DEFAULT os_auth_host $(ipv6_unquote $KEYSTONE_SERVICE_HOST) iniset $BLAZAR_CONF_FILE DEFAULT os_auth_port 80 iniset $BLAZAR_CONF_FILE DEFAULT os_auth_prefix identity iniset $BLAZAR_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD @@ -135,13 +135,16 @@ function create_blazar_accounts { "$REGION_NAME" \ "$blazar_api_url/v1" - KEYSTONEV3_SERVICE=$(get_or_create_service "keystonev3" \ - "identityv3" "Keystone Identity Service V3") - get_or_create_endpoint $KEYSTONEV3_SERVICE \ + # Create admin and internal endpoints for keystone. Blazar currently uses + # the admin endpoint to interact with keystone, but devstack stopped + # creating one in https://review.opendev.org/c/openstack/devstack/+/777345 + KEYSTONE_SERVICE=$(get_or_create_service "keystone" \ + "identity" "Keystone Identity Service") + get_or_create_endpoint $KEYSTONE_SERVICE \ "$REGION_NAME" \ - "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v3" \ - "$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v3" \ - "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v3" + "${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity" \ + "${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity" \ + "${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity" }