openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "undercloud: increase token expiration time"

This commit is contained in:
Zuul 2018-04-05 22:56:14 +00:00 committed by Gerrit Code Review
parent 46dd817d38 02cacfd53a
commit a9a8556c04
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/undercloud.yaml
View File

@ -11,6 +11,9 @@ parameter_defaults:
# ensure we enable ip_forward before docker gets run
KernelIpForward: 1
KeystoneCorsAllowedOrigin: '*'
# Increase the Token expiration time until we fix the actual session bug:
# https://bugs.launchpad.net/tripleo/+bug/1761050
TokenExpiration: 14400
EnablePackageInstall: true
StackAction: CREATE
SoftwareConfigTransport: POLL_SERVER_HEAT

5
puppet/services/keystone.yaml
View File

@ -109,6 +109,10 @@ parameters:
default: 5672
description: Set rabbit subscriber port, change this if using SSL
type: number
TokenExpiration:
default: 3600
description: Set a token expiration time in seconds.
type: number
KeystoneWorkers:
type: string
description: Set the number of workers for keystone::wsgi::apache
@ -349,6 +353,7 @@ outputs:
query:
read_default_file: /etc/my.cnf.d/tripleo.cnf
read_default_group: tripleo
keystone::token_expiration: {get_param: TokenExpiration}
keystone::admin_token: {get_param: AdminToken}
keystone::admin_password: {get_param: AdminPassword}
keystone::roles::admin::password: {get_param: AdminPassword}