Use admin_tenant_id as cinder internal tenant
admin_tenant_id is more explicit than admin_tenant_name as project names might duplicate Charm-helpers-pr: https://github.com/juju/charm-helpers/pull/861 Depends-on: I6807128492cb184de3ef5f454d0ea745246b242e Closes-Bug: #2030755 Change-Id: Idbc2f3d12dcf325b4a53a3dda1ecfa75a199295a (cherry picked from commitff442694d2
) (cherry picked from commit80115a2cb2
) (cherry picked from commite979c91908
) (cherry picked from commit73d596bb9e
)
This commit is contained in:
parent
11b9b57305
commit
1bbdd36d48
|
@ -473,9 +473,10 @@ class IdentityServiceContext(OSContextGenerator):
|
||||||
|
|
||||||
if float(api_version) > 2:
|
if float(api_version) > 2:
|
||||||
ctxt.update({
|
ctxt.update({
|
||||||
'admin_domain_name': rdata.get('service_domain'),
|
'admin_domain_name': _resolve('service_domain'),
|
||||||
'service_project_id': rdata.get('service_tenant_id'),
|
'service_user_id': _resolve('service_user_id'),
|
||||||
'service_domain_id': rdata.get('service_domain_id')})
|
'service_project_id': _resolve('service_tenant_id'),
|
||||||
|
'service_domain_id': _resolve('service_domain_id')})
|
||||||
|
|
||||||
# we keep all veriables in ctxt for compatibility and
|
# we keep all veriables in ctxt for compatibility and
|
||||||
# add nested dictionary for keystone_authtoken generic
|
# add nested dictionary for keystone_authtoken generic
|
||||||
|
@ -489,8 +490,9 @@ class IdentityServiceContext(OSContextGenerator):
|
||||||
# NOTE(jamespage) this is required for >= icehouse
|
# NOTE(jamespage) this is required for >= icehouse
|
||||||
# so a missing value just indicates keystone needs
|
# so a missing value just indicates keystone needs
|
||||||
# upgrading
|
# upgrading
|
||||||
ctxt['admin_tenant_id'] = rdata.get('service_tenant_id')
|
ctxt['admin_user_id'] = _resolve('service_user_id')
|
||||||
ctxt['admin_domain_id'] = rdata.get('service_domain_id')
|
ctxt['admin_tenant_id'] = _resolve('service_tenant_id')
|
||||||
|
ctxt['admin_domain_id'] = _resolve('service_domain_id')
|
||||||
return ctxt
|
return ctxt
|
||||||
|
|
||||||
return {}
|
return {}
|
||||||
|
|
|
@ -51,8 +51,8 @@ os_region_name = {{ region }}
|
||||||
volume_usage_audit_period = {{ volume_usage_audit_period }}
|
volume_usage_audit_period = {{ volume_usage_audit_period }}
|
||||||
|
|
||||||
{% if auth_host -%}
|
{% if auth_host -%}
|
||||||
cinder_internal_tenant_project_id = {{ admin_tenant_name }}
|
cinder_internal_tenant_project_id = {{ admin_tenant_id }}
|
||||||
cinder_internal_tenant_user_id = {{ admin_user }}
|
cinder_internal_tenant_user_id = {{ admin_user_id }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
{% include "parts/backends" %}
|
{% include "parts/backends" %}
|
||||||
|
|
|
@ -51,8 +51,8 @@ os_region_name = {{ region }}
|
||||||
volume_usage_audit_period = {{ volume_usage_audit_period }}
|
volume_usage_audit_period = {{ volume_usage_audit_period }}
|
||||||
|
|
||||||
{% if auth_host -%}
|
{% if auth_host -%}
|
||||||
cinder_internal_tenant_project_id = {{ admin_tenant_name }}
|
cinder_internal_tenant_project_id = {{ admin_tenant_id }}
|
||||||
cinder_internal_tenant_user_id = {{ admin_user }}
|
cinder_internal_tenant_user_id = {{ admin_user_id }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
{% include "parts/backends" %}
|
{% include "parts/backends" %}
|
||||||
|
|
Loading…
Reference in New Issue