openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Cleanup keystone items 

The keystone_paste_ini provider is being removed so we don't
need to include it anymore. Additionally some of the
kesytone::wsgi::apache options are being removed (like admin_port).

Change-Id: I2f8b377ba7eb472e6c229e425b3e5c42d7ec82ce
Depends-On: https://review.opendev.org/#/c/658381/
Needed-By: https://review.opendev.org/#/c/658382/
This commit is contained in:
Alex Schultz 2019-05-15 16:28:36 -06:00
parent c609599fe5
commit 462d45b829
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/keystone/keystone-container-puppet.yaml
View File

@ -489,7 +489,6 @@ outputs:
keystone::wsgi::apache::api_port:
- 5000
- {get_param: [EndpointMap, KeystoneAdmin, port]}
keystone::wsgi::apache::admin_port: {get_param: [EndpointMap, KeystoneAdmin, port]}
keystone::wsgi::apache::ssl: {get_param: EnableInternalTLS}
keystone::wsgi::apache::servername:
str_replace:
@ -800,7 +799,7 @@ outputs:
# Keystone endpoint creation occurs only on single node
step_3:
config_volume: 'keystone_init_tasks'
puppet_tags: 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_paste_ini,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain'
puppet_tags: 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain'
step_config: 'include ::tripleo::profile::base::keystone'
config_image: *keystone_config_image
host_prep_tasks: {get_attr: [KeystoneLogging, host_prep_tasks]}