Merge "Make Horizon parameters: vhost_extra_params and customization_module configurable" into stable/ocata
This commit is contained in:
commit
2fe5baac2c
|
@ -47,6 +47,18 @@ parameters:
|
|||
MonitoringSubscriptionHorizon:
|
||||
default: 'overcloud-horizon'
|
||||
type: string
|
||||
HorizonVhostExtraParams:
|
||||
default:
|
||||
add_listen: false
|
||||
priority: 10
|
||||
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
|
||||
options: ['FollowSymLinks','MultiViews']
|
||||
description: Extra parameters for Horizon vhost configuration
|
||||
type: json
|
||||
HorizonCustomizationModule:
|
||||
default: ''
|
||||
description: Horizon has a global overrides mechanism available to perform customizations
|
||||
type: string
|
||||
|
||||
conditions:
|
||||
|
||||
|
@ -72,11 +84,7 @@ outputs:
|
|||
horizon::disallow_iframe_embed: true
|
||||
horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
|
||||
horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
|
||||
horizon::vhost_extra_params:
|
||||
add_listen: false
|
||||
priority: 10
|
||||
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
|
||||
options: ['FollowSymLinks','MultiViews']
|
||||
horizon::vhost_extra_params: {get_param: HorizonVhostExtraParams}
|
||||
horizon::bind_address: {get_param: [ServiceNetMap, HorizonNetwork]}
|
||||
horizon::keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||
horizon::password_validator: {get_param: [HorizonPasswordValidator]}
|
||||
|
@ -89,6 +97,7 @@ outputs:
|
|||
- {get_param: HorizonSecret}
|
||||
- {get_param: [DefaultPasswords, horizon_secret]}
|
||||
memcached_ipv6: {get_param: MemcachedIPv6}
|
||||
horizon::customization_module: {get_param: HorizonCustomizationModule}
|
||||
-
|
||||
if:
|
||||
- debug_empty
|
||||
|
|
Loading…
Reference in New Issue