openstack
/
charm-layer-openstack
Code Issues Proposed changes

Merge "Support service_domain for reactive charm"

This commit is contained in:
Zuul 2018-07-12 16:08:19 +00:00 committed by Gerrit Code Review
parent 4185336cf6 2de0033f2a
commit 2fc0f3e898
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/parts/section-keystone-authtoken
View File

@ -3,8 +3,13 @@
auth_uri = {{ identity_service.service_protocol }}://{{ identity_service.service_host }}:{{ identity_service.service_port }}
auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}
auth_type = password
{% if identity_service.service_domain -%}
project_domain_name = {{ identity_service.service_domain }}
user_domain_name = {{ identity_service.service_domain }}
{% else %}
project_domain_name = default
user_domain_name = default
{% endif -%}
project_name = services
username = {{ identity_service.service_username }}
password = {{ identity_service.service_password }}