openstack/charm-cinder
Code Issues Proposed changes

Use service_domain in [service_user] section

Browse Source 
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: Ide81f02361cf7e2084d4513c7d7a1d4e35f8c86e
This commit is contained in:
Corey Bryant 2023-07-06 08:59:40 -04:00
parent 2356bf8967
commit fd24b08275
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charmhelpers/contrib/openstack/templates/section-service-user
View File

@ -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 }}

2
test-requirements.txt
View File

@ -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)