Add user_domain_id to service_credentials.

Keystone authentication might use user_domain_id
as a fallback if no user_domain_name is provided.

Change-Id: I96008794a2f8cce9ee291b2e1d967deb281d988e
Closes-Bug: #1831181
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@canonical.com>
This commit is contained in:
Jorge Niedbalski 2019-06-04 15:58:15 -04:00
parent ec33cadf4c
commit 58b8feeece
3 changed files with 7 additions and 1 deletions

View File

@ -2,4 +2,4 @@
# when dependencies of the charm change,
# but nothing in the charm needs to.
# simply change the uuid to something new
120650ec-5aab-11e9-a87e-fbc92e9be59b
32418e43-ec7d-4749-974a-326fdab61914

View File

@ -28,6 +28,9 @@ auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host
project_domain_name = {{ identity_service.service_domain }}
user_domain_name = {{ identity_service.service_domain }}
{% endif -%}
{% if identity_service.service_domain_id -%}
user_domain_id = {{ identity_service.service_domain_id }}
{% endif -%}
project_name = {{ identity_service.service_tenant }}
username = {{ identity_service.service_username }}
password = {{ identity_service.service_password }}

View File

@ -30,6 +30,9 @@ auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host
project_domain_name = {{ identity_service.service_domain }}
user_domain_name = {{ identity_service.service_domain }}
{% endif -%}
{% if identity_service.service_domain_id -%}
user_domain_id = {{ identity_service.service_domain_id }}
{% endif -%}
project_name = {{ identity_service.service_tenant }}
username = {{ identity_service.service_username }}
password = {{ identity_service.service_password }}