openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Tie keystone admin API port to what we configure in t-h-t"

This commit is contained in:
Zuul 2018-02-01 15:05:32 +00:00 committed by Gerrit Code Review
parent 2ad646e22a dae0bd9b82
commit c04b3ed5eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet/services/keystone.yaml
View File

@ -378,6 +378,7 @@ outputs:
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
keystone::endpoint::region: {get_param: KeystoneRegion} keystone::endpoint::region: {get_param: KeystoneRegion}
keystone::endpoint::version: '' keystone::endpoint::version: ''
keystone::admin_port: {get_param: [EndpointMap, KeystoneAdmin, port]}
keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge} keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
keystone::rabbit_heartbeat_timeout_threshold: 60 keystone::rabbit_heartbeat_timeout_threshold: 60
keystone::cron::token_flush::maxdelay: 3600 keystone::cron::token_flush::maxdelay: 3600
@ -389,6 +390,7 @@ outputs:
value: 'keystone.contrib.ec2.backends.sql.Ec2' value: 'keystone.contrib.ec2.backends.sql.Ec2'
keystone::service_name: 'httpd' keystone::service_name: 'httpd'
keystone::enable_ssl: {get_param: EnableInternalTLS} keystone::enable_ssl: {get_param: EnableInternalTLS}
keystone::wsgi::apache::admin_port: {get_param: [EndpointMap, KeystoneAdmin, port]}
keystone::wsgi::apache::ssl: {get_param: EnableInternalTLS} keystone::wsgi::apache::ssl: {get_param: EnableInternalTLS}
keystone::wsgi::apache::servername: keystone::wsgi::apache::servername:
str_replace: str_replace:
@ -412,8 +414,7 @@ outputs:
dport: dport:
- 5000 - 5000
- 13000 - 13000
- 35357 - {get_param: [EndpointMap, KeystoneAdmin, port]}
- 13357
keystone::admin_bind_host: keystone::admin_bind_host:
str_replace: str_replace:
template: template: