summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2016-04-05 11:34:49 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2016-04-11 07:51:07 -0400
commit1c7b9359b20d3da69b665f63d2354229b253401c (patch)
treeb4a2003ef18c8b1f4f3d821a53541a968d800b0f
parent61a55c7b91dcc3f9eec13c8ee0057a7123d4b150 (diff)
Map gnocchi vip to haproxy_listen_bind_param
Change-Id: I7d2eb9405e0171fc54fa0b616122f69db5f51ce2
-rw-r--r--manifests/loadbalancer.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 0b9fd5e..ce83803 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -661,13 +661,13 @@ class tripleo::loadbalancer (
$gnocchi_api_vip = hiera('gnocchi_api_vip', $controller_virtual_ip)
if $service_certificate {
$gnocchi_bind_opts = {
- "${gnocchi_api_vip}:${ports[gnocchi_api_port]}" => [],
- "${public_virtual_ip}:${ports[gnocchi_api_ssl_port]}" => ['ssl', 'crt', $service_certificate],
+ "${gnocchi_api_vip}:${ports[gnocchi_api_port]}" => $haproxy_listen_bind_param,
+ "${public_virtual_ip}:${ports[gnocchi_api_ssl_port]}" => union($haproxy_listen_bind_param, ['ssl', 'crt', $service_certificate]),
}
} else {
$gnocchi_bind_opts = {
- "${gnocchi_api_vip}:${ports[gnocchi_api_port]}" => [],
- "${public_virtual_ip}:${ports[gnocchi_api_port]}" => [],
+ "${gnocchi_api_vip}:${ports[gnocchi_api_port]}" => $haproxy_listen_bind_param,
+ "${public_virtual_ip}:${ports[gnocchi_api_port]}" => $haproxy_listen_bind_param,
}
}