aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2016-11-10 21:32:03 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2016-11-11 12:42:47 +0800
commitfc541633190a08ea3913ec7020b4c568ad4c21bc (patch)
tree35bd72bffd7dfe3aa6c5844d3a4da0b8fe0d0f8e /ansible
parent2e01ce50f54a03b9036d54b08f20074cea69bec0 (diff)
downloadkolla-fc541633190a08ea3913ec7020b4c568ad4c21bc.tar.gz
kolla-fc541633190a08ea3913ec7020b4c568ad4c21bc.zip
Use uuid as keystone default token provider
Keystone uses fernet as default provider in its code now. This patch adds provider=token in keystone.conf file explicitly. TrivialFix Change-Id: Id7142ff4f00ee99579ad420573eafefea0f4dcb7
Diffstat (limited to 'ansible')
-rw-r--r--ansible/group_vars/all.yml1
-rw-r--r--ansible/roles/keystone/templates/keystone.conf.j24
2 files changed, 4 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 24772f765..6e165f00d 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 }}