openstack/charm-layer-openstack
Code Issues Proposed changes

Support service_domain for reactive charm

Browse Source 
Hard coded default domain causes problem sometimes
Adding code for supporting service_domain
Please note that each charm using
layer openstack charm also need to be fixed
if you want to use service_domain instead of default

Change-Id: I1d56359a64c23019151c9c9186ca0c7374735536
This commit is contained in:
Seyeong Kim 2018-06-27 14:34:32 +09:00
parent ff5f2d22ed
commit 2de0033f2a
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_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_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}
auth_type = password 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 project_domain_name = default
user_domain_name = default user_domain_name = default
{% endif -%}
project_name = services project_name = services
username = {{ identity_service.service_username }} username = {{ identity_service.service_username }}
password = {{ identity_service.service_password }} password = {{ identity_service.service_password }}