openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use uuid as keystone default token provider"

Browse Source
This commit is contained in:
Jenkins 2016-11-11 08:01:04 +00:00 committed by Gerrit Code Review
commit dbb0ade6d1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -338,6 +338,7 @@ keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keyston
keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3"
keystone_public_url: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}/v3"
# Valid options are [ uuid, fernet ]
keystone_token_provider: "uuid"
fernet_token_expiry: 86400

4
ansible/roles/keystone/templates/keystone.conf.j2
View File

@ -20,8 +20,10 @@ domain_specific_drivers_enabled = true
domain_config_dir = /etc/keystone/domains
{% endif %}
{% if keystone_token_provider == 'fernet' %}
[token]
{% if keystone_token_provider == 'uuid' %}
provider = uuid
{% elif keystone_token_provider == 'fernet' %}
provider = {{ keystone_token_provider }}
expiration = {{ fernet_token_expiry }}