openstack/fuel-library
Code Issues Proposed changes

Merge "Make rsyslog catch all haproxy requests"

Browse Source
This commit is contained in:
Jenkins 2015-08-11 10:24:45 +00:00 committed by Gerrit Code Review
commit 3a3b3698aa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp
View File

@ -7,7 +7,8 @@ $service_endpoint = hiera('service_endpoint', '')
$primary_controller = hiera('primary_controller')
#FIXME(mattymo): Replace with only VIPs for roles assigned to this node
$stats_ipaddresses = delete_undef_values([$management_vip, $database_vip, $service_endpoint, '127.0.0.1'])
$stats_ipaddresses = delete_undef_values([$management_vip, $database_vip,
$service_endpoint, '127.0.0.1'])
class { 'cluster::haproxy':
haproxy_maxconn => '16000',
@ -17,3 +18,10 @@ class { 'cluster::haproxy':
other_networks => direct_networks($network_scheme['endpoints']),
stats_ipaddresses => $stats_ipaddresses
}
file_line { 'AddUnixListenSocket':
path => '/etc/rsyslog.d/haproxy.conf',
match => '^\$AddUnixListenSocket /var/lib/haproxy/dev/log',
line => '$AddUnixListenSocket /dev/log',
require => Class['cluster::haproxy'],
}