openstack
/
charm-aodh
Code Issues Proposed changes

Merge "Render v3 compliant keystone config when needed"

This commit is contained in:
Jenkins 2016-08-03 15:51:04 +00:00 committed by Gerrit Code Review
parent 6107f45e7f 12a3be0204
commit c63fea2738
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/templates/aodh.conf
View File

@ -11,16 +11,7 @@ connection = {{ shared_db.uri }}
connection = mongodb://{{ mongodb.hostname }}:{{ mongodb.port }}/aodh
{%- endif %}
[keystone_authtoken]
{% if identity_service.auth_host -%}
auth_type = password
identity_uri = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_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 }}
project_name = {{ identity_service.service_tenant }}
username = {{ identity_service.service_username }}
password = {{ identity_service.service_password }}
{%- endif %}
{% include "parts/section-keystone-authtoken" %}
[service_credentials]
{% if identity_service.auth_host -%}