diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-09-15 08:08:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-09-15 08:08:15 +0000 |
| commit | 7ca1bbf046abfd0cc5897fba49683c62e2c33dbe (patch) | |
| tree | ec9071fc0dc6e7f146dc0af0d7df5788b8d6a96d | |
| parent | ff6f4864e6f999faff75e8c720f789a3876c938c (diff) | |
| parent | 14ac699d8ab97dda03b8711f1a8ac26f6fd52191 (diff) | |
Merge "Allow a user to specify the syslog address for HAProxy"
| -rw-r--r-- | manifests/loadbalancer.pp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 1ee7573..2bfc83b 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -35,6 +35,10 @@ # The value to use as maxconn in the haproxy default config section. # Defaults to 4096 # +# [*haproxy_log_address*] +# The IPv4, IPv6 or filesystem socket path of the syslog server. +# Defaults to '/dev/log' +# # [*controller_host*] # (Deprecated)Host or group of hosts to load-balance the services # Can be a string or an array. @@ -246,6 +250,7 @@ class tripleo::loadbalancer ( $haproxy_service_manage = true, $haproxy_global_maxconn = 20480, $haproxy_default_maxconn = 4096, + $haproxy_log_address = '/dev/log', $controller_host = undef, $controller_hosts = undef, $controller_hosts_names = undef, @@ -630,7 +635,7 @@ class tripleo::loadbalancer ( class { '::haproxy': service_manage => $haproxy_service_manage, global_options => { - 'log' => '/dev/log local0', + 'log' => "${haproxy_log_address} local0", 'pidfile' => '/var/run/haproxy.pid', 'user' => 'haproxy', 'group' => 'haproxy', |