Horizon service cleanups for hiera json hook
This patch resolves a few issues I noticed when porting our Horizon service to support the new heat hiera agent hook (which uses Json instead of Yaml). -we only need to set django_debug if the string is non-empty. This should match previous behavior. -remove the duplicated NeutronMechanismDrivers setting. This is already managed in the neutron services and shouldn't be set here. Change-Id: I473e110bb9b14cb8f57d41c4fc398871548726b0 Partial-bug: #1596373
This commit is contained in:
parent
b7cfa7f7b8
commit
133edad130
|
@ -24,7 +24,7 @@ parameters:
|
||||||
type: json
|
type: json
|
||||||
HorizonAllowedHosts:
|
HorizonAllowedHosts:
|
||||||
default: '*'
|
default: '*'
|
||||||
description: A list of IP/Hostname for the server Horizonis running on.
|
description: A list of IP/Hostname for the server Horizon is running on.
|
||||||
Used for header checks.
|
Used for header checks.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
HorizonSecret:
|
HorizonSecret:
|
||||||
|
@ -32,11 +32,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
default: ''
|
default: ''
|
||||||
NeutronMechanismDrivers:
|
|
||||||
default: 'openvswitch'
|
|
||||||
description: |
|
|
||||||
The mechanism drivers for the Neutron tenant network.
|
|
||||||
type: comma_delimited_list
|
|
||||||
MemcachedIPv6:
|
MemcachedIPv6:
|
||||||
default: false
|
default: false
|
||||||
description: Enable IPv6 features in Memcached.
|
description: Enable IPv6 features in Memcached.
|
||||||
|
@ -45,6 +40,10 @@ parameters:
|
||||||
default: 'overcloud-horizon'
|
default: 'overcloud-horizon'
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
debug_empty: {equals : [{get_param: Debug}, '']}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the Horizon role.
|
description: Role data for the Horizon role.
|
||||||
|
@ -52,34 +51,34 @@ outputs:
|
||||||
service_name: horizon
|
service_name: horizon
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionHorizon}
|
monitoring_subscription: {get_param: MonitoringSubscriptionHorizon}
|
||||||
config_settings:
|
config_settings:
|
||||||
horizon::allowed_hosts: {get_param: HorizonAllowedHosts}
|
map_merge:
|
||||||
neutron::plugins::ml2::mechanism_drivers:
|
- horizon::allowed_hosts: {get_param: HorizonAllowedHosts}
|
||||||
str_replace:
|
tripleo.horizon.firewall_rules:
|
||||||
template: MECHANISMS
|
'126 horizon':
|
||||||
params:
|
dport:
|
||||||
MECHANISMS: {get_param: NeutronMechanismDrivers}
|
- 80
|
||||||
tripleo.horizon.firewall_rules:
|
- 443
|
||||||
'126 horizon':
|
horizon::disable_password_reveal: true
|
||||||
dport:
|
horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
|
||||||
- 80
|
horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
|
||||||
- 443
|
horizon::vhost_extra_params:
|
||||||
horizon::disable_password_reveal: true
|
add_listen: false
|
||||||
horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
|
priority: 10
|
||||||
horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
|
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
|
||||||
horizon::vhost_extra_params:
|
horizon::bind_address: {get_param: [ServiceNetMap, HorizonNetwork]}
|
||||||
add_listen: false
|
horizon::keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||||
priority: 10
|
horizon::secret_key:
|
||||||
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
|
yaql:
|
||||||
horizon::bind_address: {get_param: [ServiceNetMap, HorizonNetwork]}
|
expression: $.data.passwords.where($ != '').first()
|
||||||
horizon::django_debug: {get_param: Debug}
|
data:
|
||||||
horizon::keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
passwords:
|
||||||
horizon::secret_key:
|
- {get_param: HorizonSecret}
|
||||||
yaql:
|
- {get_param: [DefaultPasswords, horizon_secret]}
|
||||||
expression: $.data.passwords.where($ != '').first()
|
memcached_ipv6: {get_param: MemcachedIPv6}
|
||||||
data:
|
-
|
||||||
passwords:
|
if:
|
||||||
- {get_param: HorizonSecret}
|
- debug_empty
|
||||||
- {get_param: [DefaultPasswords, horizon_secret]}
|
- {}
|
||||||
memcached_ipv6: {get_param: MemcachedIPv6}
|
- horizon::django_debug: {get_param: Debug}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::horizon
|
include ::tripleo::profile::base::horizon
|
||||||
|
|
Loading…
Reference in New Issue