openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix haproxy stats network binding"

This commit is contained in:
Zuul 2019-05-31 02:32:24 +00:00 committed by Gerrit Code Review
parent e47bc1fcc9 45f5c283e3
commit 92bd1a5417
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -168,6 +168,12 @@ outputs:
tripleo::haproxy::haproxy_log_facility: {get_param: HAProxySyslogFacility} tripleo::haproxy::haproxy_log_facility: {get_param: HAProxySyslogFacility}
tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser} tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser}
tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword} tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword}
tripleo::haproxy::haproxy_stats_bind_address:
str_replace:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, HaproxyNetwork]}
tripleo::haproxy::redis_password: {get_param: RedisPassword} tripleo::haproxy::redis_password: {get_param: RedisPassword}
tripleo::haproxy::crl_file: {get_param: InternalTLSCRLPEMFile} tripleo::haproxy::crl_file: {get_param: InternalTLSCRLPEMFile}
tripleo::haproxy::haproxy_stats: {get_param: HAProxyStatsEnabled} tripleo::haproxy::haproxy_stats: {get_param: HAProxyStatsEnabled}

2
network/service_net_map.j2.yaml
View File

@ -94,6 +94,8 @@ parameters:
EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
OpenshiftMasterNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} OpenshiftMasterNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
OpenshiftInfraNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} OpenshiftInfraNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
# HaproxyNetwork currently only controls the haproxy.stats network binding
HaproxyNetwork: ctlplane
# We special-case the default ResolveNetwork for the Ceph roles # We special-case the default ResolveNetwork for the Ceph roles
# for backwards compatibility, all other roles default to internal_api # for backwards compatibility, all other roles default to internal_api
{%- for role in roles if role.name.startswith('Ceph') %} {%- for role in roles if role.name.startswith('Ceph') %}