openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "docker: don't override horizon::vhost_extra_params"

Browse Source
This commit is contained in:
Zuul
2018-02-17 22:23:13 +00:00
committed by Gerrit Code Review
parent 5d1c1d0bba 995cf71057
commit b80b208359
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/horizon.yaml
View File

@@ -67,11 +67,6 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [HorizonBase, role_data, config_settings] - get_attr: [HorizonBase, role_data, config_settings]
- horizon::vhost_extra_params:
add_listen: true
priority: 10
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
options: ['FollowSymLinks','MultiViews']
- horizon::secure_cookies: false - horizon::secure_cookies: false
logging_source: {get_attr: [HorizonBase, role_data, logging_source]} logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]} logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]}

1
puppet/services/horizon.yaml
View File

@@ -79,6 +79,7 @@ parameters:
services in the internal network. services in the internal network.
HorizonVhostExtraParams: HorizonVhostExtraParams:
default: default:
add_listen: true
priority: 10 priority: 10
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"' access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
options: ['FollowSymLinks','MultiViews'] options: ['FollowSymLinks','MultiViews']