openstack/charm-glance
Code Issues Proposed changes

Switch to using charm-helper templates for keystone authtoken

Browse Source
This commit is contained in:
james.page@ubuntu.com
2015-03-25 09:25:38 +00:00
parent cac632448a
commit e129b45488
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/kilo/glance-api.conf
View File

@@ -71,15 +71,9 @@ filesystem_store_datadir = /var/lib/glance/images/
[image_format]
disk_formats=ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,root-tar
{% 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 }}
{% include "section-keystone-authtoken" %}
{% if auth_host -%}
[paste_deploy]
flavor = keystone
{% endif %}

10
templates/kilo/glance-registry.conf
View File

@@ -17,15 +17,9 @@ limit_param_default = 25
{% endfor -%}
{% endif -%}
{% 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 }}
{% include "section-keystone-authtoken" %}
{% if auth_host -%}
[paste_deploy]
flavor = keystone
{% endif %}