openstack
/
charm-aodh
Code Issues Proposed changes

Render v3 compliant keystone config when needed 

The charm currently fails to connect to keystone because it lacks
domain information. This change switches the aodh.conf template to
use the template fragment for keystone_authtoken which supports v2.0
and v3.

Change-Id: I421aa17ce7d1f3c5a3634ecee2310a3d351f65dd
This commit is contained in:
Liam Young 2016-08-03 12:31:44 +00:00
parent 86a407bca2
commit 12a3be0204
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 -%}