From 255ea29cd425f096a22c000ecdc9e594cacdd36c Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Tue, 22 Nov 2016 10:31:02 +0200
Subject: [PATCH] Use mode 'http' in haproxy for ceilometer, neutron, aodh and
 gnocchi

HAProxy won't pass X-Forwarded-Proto to these services in mode tcp, so we need
to switch it to http in order for it to work and for the services to properly
set the protocol in the links they serve.

Change-Id: Ib10282159fb9269eebe81af23171ec9fb1297cd0
Closes-Bug: #1640126
---
 manifests/haproxy.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 6f6856238..31a18bfe0 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -784,6 +784,7 @@ class tripleo::haproxy (
       service_port      => $ports[neutron_api_port],
       ip_addresses      => hiera('neutron_api_node_ips', $controller_hosts_real),
       server_names      => hiera('neutron_api_node_names', $controller_hosts_names_real),
+      mode              => 'http',
       listen_options    => {
           'http-request' => [
             'set-header X-Forwarded-Proto https if { ssl_fc }',
@@ -935,6 +936,7 @@ class tripleo::haproxy (
       service_port      => $ports[ceilometer_api_port],
       ip_addresses      => hiera('ceilometer_api_node_ips', $controller_hosts_real),
       server_names      => hiera('ceilometer_api_node_names', $controller_hosts_names_real),
+      mode              => 'http',
       listen_options    => {
           'http-request' => [
             'set-header X-Forwarded-Proto https if { ssl_fc }',
@@ -953,6 +955,7 @@ class tripleo::haproxy (
       service_port      => $ports[aodh_api_port],
       ip_addresses      => hiera('aodh_api_node_ips', $controller_hosts_real),
       server_names      => hiera('aodh_api_node_names', $controller_hosts_names_real),
+      mode              => 'http',
       listen_options    => {
           'http-request' => [
             'set-header X-Forwarded-Proto https if { ssl_fc }',
@@ -984,6 +987,7 @@ class tripleo::haproxy (
       service_port      => $ports[gnocchi_api_port],
       ip_addresses      => hiera('gnocchi_api_node_ips', $controller_hosts_real),
       server_names      => hiera('gnocchi_api_node_names', $controller_hosts_names_real),
+      mode              => 'http',
       listen_options    => {
           'http-request' => [
             'set-header X-Forwarded-Proto https if { ssl_fc }',