Merge "Remove uuid as keystone_token_provider"

This commit is contained in:
Zuul 2018-05-04 07:48:40 +00:00 committed by Gerrit Code Review
commit 4caea9d6d2
3 changed files with 9 additions and 4 deletions

View File

@ -574,8 +574,8 @@ default_project_domain_id: "default"
default_user_domain_name: "Default" default_user_domain_name: "Default"
default_user_domain_id: "default" default_user_domain_id: "default"
# Valid options are [ uuid, fernet ] # Valid options are [ fernet ]
keystone_token_provider: "uuid" keystone_token_provider: "fernet"
fernet_token_expiry: 86400 fernet_token_expiry: 86400
keystone_default_user_role: "_member_" keystone_default_user_role: "_member_"

View File

@ -281,8 +281,8 @@ kolla_internal_vip_address: "10.10.10.254"
# Keystone - Identity Options # Keystone - Identity Options
############################# #############################
# Valid options are [ uuid, fernet ] # Valid options are [ fernet ]
#keystone_token_provider: 'uuid' #keystone_token_provider: 'fernet'
# Interval to rotate fernet keys by (in seconds). Must be an interval of # Interval to rotate fernet keys by (in seconds). Must be an interval of
# 60(1 min), 120(2 min), 180(3 min), 240(4 min), 300(5 min), 360(6 min), # 60(1 min), 120(2 min), 180(3 min), 240(4 min), 300(5 min), 360(6 min),

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Remove uuid option form keystone_token_provider due to it's removed in
Keystone.