From: James Slagle <jslagle@redhat.com>
Date: Sat, 18 Jul 2015 00:00:52 +0000 (-0400)
Subject: Listener options for Ironic/ceilometer/glance_registry
X-Git-Tag: opnfv-6.0.0~846
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a18c3a8548000181bacd96fa465914945a49c59e;p=apex-puppet-tripleo.git

Listener options for Ironic/ceilometer/glance_registry

This updates some of the listener options set by loadbalancer.pp.

Iroinc needs to pass in the option to do a httpchk, otherwise
puppet-haproxy defaults it to doing a ssl-hello-chk, which won't work
against the non-ssl loadbalancer server.

Ceilometer and glance_registry both don't support a httpchk against the
root (/) of their webservers (they return a straight 401) so disable
those checks completely.

Change-Id: Ibfc81175842a748eb077b132b0818c4ea17bbcf6
---

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index a40c7c0..4596b50 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -719,6 +719,9 @@ class tripleo::loadbalancer (
   if $glance_registry {
     haproxy::listen { 'glance_registry':
       ipaddress        => hiera('glance_registry_vip', $controller_virtual_ip),
+      options          => {
+        'option' => [ ],
+      },
       ports            => 9191,
       collect_exported => false,
     }
@@ -803,6 +806,9 @@ class tripleo::loadbalancer (
   if $ceilometer {
     haproxy::listen { 'ceilometer':
       bind             => $ceilometer_bind_opts,
+      options          => {
+        'option' => [ ],
+      },
       collect_exported => false,
     }
     haproxy::balancermember { 'ceilometer':
@@ -917,6 +923,9 @@ class tripleo::loadbalancer (
   if $ironic {
     haproxy::listen { 'ironic':
       bind             => $ironic_bind_opts,
+      options          => {
+        'option' => [ 'httpchk GET /' ],
+      },
       collect_exported => false,
     }
     haproxy::balancermember { 'ironic':