diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-21 13:35:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-21 13:35:20 +0000 |
| commit | dc70e9dfbc4a1c6612659335ae51d9e46b73b4a4 (patch) | |
| tree | 5f99c8028ca712d0b8079dcbb95aa880c9caf955 /manifests | |
| parent | 620d5bacef10cf309fc2d4e41b6f875e19f3a7f2 (diff) | |
| parent | e1abfd7e6c6d64e8b6bf2bed019f9894e40db9e7 (diff) | |
Merge "Make enabling haproxy stats interface configurable"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/haproxy.pp | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 436e81a..2f29674 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -155,6 +155,10 @@ # When set, enables SSL on the haproxy stats endpoint using the specified file. # Defaults to undef # +# [*haproxy_stats*] +# (optional) Enable or not the haproxy stats interface +# Defaults to true +# # [*keystone_admin*] # (optional) Enable or not Keystone Admin API binding # Defaults to hiera('keystone_enabled', false) @@ -575,6 +579,7 @@ class tripleo::haproxy ( $ca_bundle = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt', $crl_file = undef, $haproxy_stats_certificate = undef, + $haproxy_stats = true, $keystone_admin = hiera('keystone_enabled', false), $keystone_public = hiera('keystone_enabled', false), $neutron = hiera('neutron_api_enabled', false), @@ -876,19 +881,21 @@ class tripleo::haproxy ( listen_options => $default_listen_options, } - $stats_base = ['enable', 'uri /'] - if $haproxy_stats_password { - $stats_config = union($stats_base, ["auth ${haproxy_stats_user}:${haproxy_stats_password}"]) - } else { - $stats_config = $stats_base - } - haproxy::listen { 'haproxy.stats': - bind => $haproxy_stats_bind_opts, - mode => 'http', - options => { - 'stats' => $stats_config, - }, - collect_exported => false, + if $haproxy_stats { + $stats_base = ['enable', 'uri /'] + if $haproxy_stats_password { + $stats_config = union($stats_base, ["auth ${haproxy_stats_user}:${haproxy_stats_password}"]) + } else { + $stats_config = $stats_base + } + haproxy::listen { 'haproxy.stats': + bind => $haproxy_stats_bind_opts, + mode => 'http', + options => { + 'stats' => $stats_config, + }, + collect_exported => false, + } } if $keystone_admin { |