Map gnocchi vip to haproxy_listen_bind_param
authorPradeep Kilambi <pkilambi@redhat.com>
Tue, 5 Apr 2016 15:34:49 +0000 (11:34 -0400)
committerPradeep Kilambi <pkilambi@redhat.com>
Mon, 11 Apr 2016 11:51:07 +0000 (07:51 -0400)
Change-Id: I7d2eb9405e0171fc54fa0b616122f69db5f51ce2

manifests/loadbalancer.pp

index 0b9fd5e..ce83803 100644 (file)
@@ -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,
     }
   }