openstack
/
charm-cinder
Code Issues Proposed changes

Merge "Use admin_tenant_id as cinder internal tenant" into stable/zed

This commit is contained in:
Zuul 2024-04-04 15:27:40 +00:00 committed by Gerrit Code Review
parent 4d99a5bff8 73d596bb9e
commit 901914e78d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charmhelpers/contrib/openstack/context.py
View File

@ -525,6 +525,7 @@ class IdentityServiceContext(OSContextGenerator):
if float(api_version) > 2:
ctxt.update({
'admin_domain_name': _resolve('service_domain'),
'service_user_id': _resolve('service_user_id'),
'service_project_id': _resolve('service_tenant_id'),
'service_domain_id': _resolve('service_domain_id')})
@ -557,6 +558,7 @@ class IdentityServiceContext(OSContextGenerator):
# NOTE(jamespage) this is required for >= icehouse
# so a missing value just indicates keystone needs
# upgrading
ctxt['admin_user_id'] = _resolve('service_user_id')
ctxt['admin_tenant_id'] = _resolve('service_tenant_id')
ctxt['admin_domain_id'] = _resolve('service_domain_id')
return ctxt

4
templates/ocata/cinder.conf
View File

@ -51,8 +51,8 @@ os_region_name = {{ region }}
volume_usage_audit_period = {{ volume_usage_audit_period }}
{% if auth_host -%}
cinder_internal_tenant_project_id = {{ admin_tenant_name }}
cinder_internal_tenant_user_id = {{ admin_user }}
cinder_internal_tenant_project_id = {{ admin_tenant_id }}
cinder_internal_tenant_user_id = {{ admin_user_id }}
{% endif -%}
{% include "parts/backends" %}

4
templates/ussuri/cinder.conf
View File

@ -51,8 +51,8 @@ os_region_name = {{ region }}
volume_usage_audit_period = {{ volume_usage_audit_period }}
{% if auth_host -%}
cinder_internal_tenant_project_id = {{ admin_tenant_name }}
cinder_internal_tenant_user_id = {{ admin_user }}
cinder_internal_tenant_project_id = {{ admin_tenant_id }}
cinder_internal_tenant_user_id = {{ admin_user_id }}
{% endif -%}
{% include "parts/backends" %}