openstack
/
charm-keystone
Code Issues Proposed changes

Remove references to `pki` and `pkiz` tokens in templates 

The functionality was removed from charm in commit
17b24e7fde

Template references was left behind and this commit addresses
that.

Change-Id: I55362faec21f32cccdcb82f810680b70fe2fb53b
This commit is contained in:
Frode Nordahl 2018-07-24 12:40:49 +02:00
parent 70414878d5
commit 75811fdcf7
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
4 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/icehouse/keystone.conf
View File

@ -43,13 +43,7 @@ driver = keystone.catalog.backends.sql.Catalog
[token]
driver = keystone.token.backends.sql.Token
{% if token_provider == 'pki' -%}
provider = keystone.token.providers.pki.Provider
{% elif token_provider == 'pkiz' -%}
provider = keystone.token.providers.pkiz.Provider
{% else -%}
provider = keystone.token.providers.uuid.Provider
{% endif -%}
expiration = {{ token_expiration }}
{% include "parts/section-signing" %}

6
templates/kilo/keystone.conf
View File

@ -54,13 +54,7 @@ driver = keystone.catalog.backends.sql.Catalog
[token]
driver = keystone.token.persistence.backends.sql.Token
{% if token_provider == 'pki' -%}
provider = keystone.token.providers.pki.Provider
{% elif token_provider == 'pkiz' -%}
provider = keystone.token.providers.pkiz.Provider
{% else -%}
provider = keystone.token.providers.uuid.Provider
{% endif -%}
expiration = {{ token_expiration }}
{% include "parts/section-signing" %}

6
templates/mitaka/keystone.conf
View File

@ -45,13 +45,7 @@ driver = sql
[token]
driver = sql
{% if token_provider == 'pki' -%}
provider = keystone.token.providers.pki.Provider
{% elif token_provider == 'pkiz' -%}
provider = keystone.token.providers.pkiz.Provider
{% else -%}
provider = uuid
{% endif -%}
expiration = {{ token_expiration }}
{% include "parts/section-signing" %}

6
templates/ocata/keystone.conf
View File

@ -45,13 +45,7 @@ driver = sql
[token]
driver = sql
{% if token_provider == 'pki' -%}
provider = keystone.token.providers.pki.Provider
{% elif token_provider == 'pkiz' -%}
provider = keystone.token.providers.pkiz.Provider
{% else -%}
provider = uuid
{% endif -%}
expiration = {{ token_expiration }}
{% include "parts/section-signing" %}