From 0985cf0a58a9389361910fc61a9420190960e34e Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Thu, 6 Jul 2023 08:59:51 -0400 Subject: [PATCH] Use service_domain in [service_user] section Sync from charm-helpers to update [service_user] config to use the service domain. The keystone charm currently creates two service users, one for the service domain (for v3 authentication), and the other for the default domain (for v2 authentication). The [service_user] config needs to use the service domain. Closes-Bug: #2026202 Change-Id: If54928aca61a400dbb864d02e3807f28123b8517 --- charmhelpers/contrib/openstack/templates/section-service-user | 4 ++-- test-requirements.txt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charmhelpers/contrib/openstack/templates/section-service-user b/charmhelpers/contrib/openstack/templates/section-service-user index c740cc28..ff454086 100644 --- a/charmhelpers/contrib/openstack/templates/section-service-user +++ b/charmhelpers/contrib/openstack/templates/section-service-user @@ -3,8 +3,8 @@ send_service_user_token = true auth_type = password auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} -project_domain_id = default -user_domain_id = default +project_domain_name = service_domain +user_domain_name = service_domain project_name = {{ admin_tenant_name }} username = {{ admin_user }} password = {{ admin_password }} diff --git a/test-requirements.txt b/test-requirements.txt index 77482bc6..34dd51b9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -27,3 +27,5 @@ git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/zed#eg git+https://opendev.org/openstack/tempest.git#egg=tempest croniter # needed for charm-rabbitmq-server unit tests + +jsonschema<4.18.0 # jsonschema 4.18.0 depends on Rust (via rpds-py)