← Back to branch summary

~hopem/charms/trusty/keystone/lp1476325

« back to all changes in this revision

Viewing changes to templates/icehouse/keystone.conf

  • Committer: Corey Bryant
  • Date: 2015-04-01 15:15:49 UTC
  • mfrom: (138 keystone)
  • mto: This revision was merged to the branch mainline in revision 142.
  • Revision ID: corey.bryant@canonical.com-20150401151549-gpw4krpmn1aqnkv6
Merge next branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/icehouse/keystone.conf
48
48
{% elif token_provider == 'pkiz' -%}
49
49
provider = keystone.token.providers.pkiz.Provider
50
50
{% else -%}
51
 
provider = keystone.token.providers.uuid.Provider 
52
 
{% endif %}
 
51
provider = keystone.token.providers.uuid.Provider
 
52
{% endif -%}
 
53
expiration = {{ token_expiration }}
53
54
 
54
55
{% include "parts/section-signing" %}
55
56