diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-11 08:01:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-11 08:01:04 +0000 |
| commit | dbb0ade6d1e314b21de380667b6228d64db87973 (patch) | |
| tree | 3c783aea206da5aaff9b8ab3ba067a1bc639af8b | |
| parent | 6c0de18b3b5048c73104cb28ba3bcf0afd94312d (diff) | |
| parent | fc541633190a08ea3913ec7020b4c568ad4c21bc (diff) | |
| download | kolla-dbb0ade6d1e314b21de380667b6228d64db87973.tar.gz kolla-dbb0ade6d1e314b21de380667b6228d64db87973.zip | |
Merge "Use uuid as keystone default token provider"
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.conf.j2 | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 07a009447..fdd278169 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -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 diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2 index 6f73e98a0..ff33a241f 100644 --- a/ansible/roles/keystone/templates/keystone.conf.j2 +++ b/ansible/roles/keystone/templates/keystone.conf.j2 @@ -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 }} |