Merge remote-tracking branch 'origin/devstack-upstream-fixes' into yo…

…ga-devstack-fixes

Change-Id: I1b0558077715264c12c1902863a94dd7e9f2c8ba

devstack/plugin.sh

@@ -131,6 +131,17 @@ function create_blazar_accounts {
     get_or_create_endpoint $BLAZAR_SERVICE \
         "$REGION_NAME" \
         "$blazar_api_url/v1"
+
+    # 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}/identity" \
+        "${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity" \
+        "${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity"
 }