openstack
/
charm-cinder
Code Issues Proposed changes

Switch to using charm-helper templates for keystone authtoken

This commit is contained in:
james.page@ubuntu.com 2015-03-25 09:25:34 +00:00
parent aca63d9690
commit 9eb593f6d1
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/kilo/cinder.conf
View File

@ -53,15 +53,7 @@ glance_api_version = {{ glance_api_version }}
{% include "parts/backends" %}
{% if auth_host -%}
[keystone_authtoken]
identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/{{ auth_admin_prefix }}
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/{{ service_admin_prefix }}
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}
signing_dir = {{ signing_dir }}
{% endif %}
{% include "section-keystone-authtoken" %}
{% include "parts/section-database" %}