openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Enable _member_ role for undercloud install."

This commit is contained in:
Zuul 2018-11-09 19:19:28 +00:00 committed by Gerrit Code Review
parent 6669b10a38 1c64c2c07b
commit 71bd36bb57
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/undercloud.yaml
View File

@ -43,6 +43,7 @@ parameter_defaults:
KernelIpForward: 1 KernelIpForward: 1
KernelIpNonLocalBind: 1 KernelIpNonLocalBind: 1
KeystoneCorsAllowedOrigin: '*' KeystoneCorsAllowedOrigin: '*'
KeystoneEnableMember: true
# Increase the Token expiration time until we fix the actual session bug: # Increase the Token expiration time until we fix the actual session bug:
# https://bugs.launchpad.net/tripleo/+bug/1761050 # https://bugs.launchpad.net/tripleo/+bug/1761050
TokenExpiration: 14400 TokenExpiration: 14400

5
puppet/services/keystone.yaml
View File

@ -309,6 +309,10 @@ parameters:
default: '' default: ''
description: Indicate whether this resource may be shared with the domain received in the request description: Indicate whether this resource may be shared with the domain received in the request
"origin" header. "origin" header.
KeystoneEnableMember:
description: Create the _member_ role, useful for undercloud deployment.
type: boolean
default: False
parameter_groups: parameter_groups:
- label: deprecated - label: deprecated
@ -366,6 +370,7 @@ outputs:
- cors_allowed_origin_unset - cors_allowed_origin_unset
- {} - {}
- keystone::cors::allowed_origin: {get_param: KeystoneCorsAllowedOrigin} - keystone::cors::allowed_origin: {get_param: KeystoneCorsAllowedOrigin}
- keystone_enable_member: {get_param: KeystoneEnableMember}
- keystone::database_connection: - keystone::database_connection:
make_url: make_url:
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}